etc/VancedMicroG
0
0
Fork 0
mirror of https://github.com/YTVanced/VancedMicroG synced 2024-11-28 14:13:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2 from dicer/master

Browse source 
Fixed compile in AOSP/CM13
This commit is contained in:
Marvin W 2016-02-11 16:51:34 +01:00
commit 281acd77b3
3 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Android.mk
View file

@ -4,4 +4,6 @@ include $(CLEAR_VARS)
LOCAL_MODULE := MicroGUiTools LOCAL_MODULE := MicroGUiTools
LOCAL_SRC_FILES := $(call all-java-files-under, microg-ui-tools/src/main/java) LOCAL_SRC_FILES := $(call all-java-files-under, microg-ui-tools/src/main/java)
LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4 android-support-v7-appcompat
include $(BUILD_STATIC_JAVA_LIBRARY) include $(BUILD_STATIC_JAVA_LIBRARY)

10
microg-ui-tools/src/main/res/layout/about_root.xml
View file

@ -34,7 +34,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:text="microG UI Demo" android:text="@+id/about_root_title"
android:textAppearance="@style/TextAppearance.AppCompat.Headline" android:textAppearance="@style/TextAppearance.AppCompat.Headline"
android:textColor="?attr/colorAccent"/> android:textColor="?attr/colorAccent"/>
@ -44,7 +44,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:visibility="gone" android:visibility="gone"
android:text="Summary" android:text="@+id/about_root_summary"
android:textAppearance="@style/TextAppearance.AppCompat.Subhead" android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
android:textColor="?attr/colorAccent"/> android:textColor="?attr/colorAccent"/>
@ -53,7 +53,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:text="Version v0.1.0" android:text="@+id/about_root_version"
android:textAppearance="@style/TextAppearance.AppCompat.Subhead"/> android:textAppearance="@style/TextAppearance.AppCompat.Subhead"/>
<TextView <TextView
@ -65,7 +65,7 @@
android:paddingRight="?attr/listPreferredItemPaddingRight" android:paddingRight="?attr/listPreferredItemPaddingRight"
android:paddingTop="16dip" android:paddingTop="16dip"
android:textAppearance="@style/TextAppearance.AppCompat.Body2" android:textAppearance="@style/TextAppearance.AppCompat.Body2"
android:text="Included libraries" android:text="@+id/about_root_libraries"
android:textColor="?attr/colorAccent"/> android:textColor="?attr/colorAccent"/>
<ListView <ListView
@ -74,4 +74,4 @@
android:layout_height="0dip" android:layout_height="0dip"
android:layout_weight="1" android:layout_weight="1"
tools:listitem="@android:layout/simple_list_item_2"/> tools:listitem="@android:layout/simple_list_item_2"/>
</LinearLayout> </LinearLayout>

7
microg-ui-tools/src/main/res/values/strings.xml
View file

@ -27,4 +27,9 @@
<string name="self_check_title">Self-Check</string> <string name="self_check_title">Self-Check</string>
<string name="self_check_desc">Check if the system is correctly set up to use microG.</string> <string name="self_check_desc">Check if the system is correctly set up to use microG.</string>
</resources>
<string name="about_root_title">microG UI Demo</string>
<string name="about_root_summary">Summary</string>
<string name="about_root_version">Version v0.1.0</string>
<string name="about_root_libraries">Included libraries</string>
</resources>