Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 281acd77 authored by Marvin W.'s avatar Marvin W. 🐿️
Browse files

Merge pull request #2 from dicer/master 

Fixed compile in AOSP/CM13
parents 18fb8cb8 fd8a7a62

Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -4,4 +4,6 @@ include $(CLEAR_VARS) 
LOCAL_MODULE := MicroGUiTools

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)

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

+5 −5
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:gravity="center_horizontal"

        android:text="microG UI Demo"

        android:text="@+id/about_root_title"

        android:textAppearance="@style/TextAppearance.AppCompat.Headline"

        android:textColor="?attr/colorAccent"/>
@@ -44,7 +44,7 @@ 
        android:layout_height="wrap_content"

        android:gravity="center_horizontal"

        android:visibility="gone"

        android:text="Summary"

        android:text="@+id/about_root_summary"

        android:textAppearance="@style/TextAppearance.AppCompat.Subhead"

        android:textColor="?attr/colorAccent"/>
@@ -53,7 +53,7 @@ 
        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center_horizontal"

        android:text="Version v0.1.0"

        android:text="@+id/about_root_version"

        android:textAppearance="@style/TextAppearance.AppCompat.Subhead"/>



    <TextView
@@ -65,7 +65,7 @@ 
        android:paddingRight="?attr/listPreferredItemPaddingRight"

        android:paddingTop="16dip"

        android:textAppearance="@style/TextAppearance.AppCompat.Body2"

        android:text="Included libraries"

        android:text="@+id/about_root_libraries"

        android:textColor="?attr/colorAccent"/>



    <ListView

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

+6 −1
Original line number Diff line number Diff line
@@ -27,4 +27,9 @@ 


    <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="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>