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

Commit 87ccd55e authored by Jason Monk's avatar Jason Monk
Browse files

Switch Tuner to support prefs (and some improvements) 

Change-Id: I2ef62c0c56d4af69f9f34e1cfd297999d59b7da6
parent b1a523b4

packages/SystemUI/Android.mk

+9 −2
Original line number Diff line number Diff line
@@ -8,7 +8,11 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-proto-files-unde 


LOCAL_STATIC_JAVA_LIBRARIES := \

    Keyguard \

    android-support-v7-recyclerview

    android-support-v7-recyclerview \

    android-support-v7-preference \

    android-support-v7-appcompat \

    android-support-v14-preference



LOCAL_JAVA_LIBRARIES := telephony-common



LOCAL_PACKAGE_NAME := SystemUI
@@ -22,10 +26,13 @@ LOCAL_PROGUARD_FLAG_FILES := proguard.flags 
LOCAL_RESOURCE_DIR := \

    frameworks/base/packages/Keyguard/res \

    $(LOCAL_PATH)/res \

    frameworks/support/v7/preference/res \

    frameworks/support/v14/preference/res \

    frameworks/support/v7/appcompat/res \

    frameworks/support/v7/recyclerview/res



LOCAL_AAPT_FLAGS := --auto-add-overlay \

     --extra-packages com.android.keyguard:android.support.v7.recyclerview

    --extra-packages com.android.keyguard:android.support.v7.recyclerview:android.support.v7.preference:android.support.v14.preference:android.support.v7.appcompat



ifneq ($(SYSTEM_UI_INCREMENTAL_BUILDS),)

    LOCAL_PROGUARD_ENABLED := disabled

packages/SystemUI/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ 
        <activity android:name=".tuner.TunerActivity"

                  android:enabled="false"

                  android:icon="@drawable/tuner"

                  android:theme="@android:style/Theme.Material.Settings"

                  android:theme="@style/TunerSettings"

                  android:label="@string/system_ui_tuner"

                  android:process=":tuner"

                  android:exported="true">

packages/SystemUI/proguard.flags

+6 −0
Original line number Diff line number Diff line
@@ -27,3 +27,9 @@ 
    public float getTaskProgress();

    public void setTaskProgress(float);

}



-keepclasseswithmembers class * {

    public <init>(android.content.Context, android.util.AttributeSet);

}



-keep class ** extends android.support.v14.preference.PreferenceFragment

packages/SystemUI/res/values/styles.xml

+4 −0
Original line number Diff line number Diff line
@@ -315,4 +315,8 @@ 
        <item name="android:layout_height">48dp</item>

    </style>



    <style name="TunerSettings" parent="@android:style/Theme.Material.Settings">

        <item name="preferenceTheme">@android:style/Theme.Material.Settings</item>

    </style>



</resources>

packages/SystemUI/res/xml/tuner_prefs.xml

+4 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
        sysui:defValue="true" />



    <PreferenceScreen

        android:key="status_bar"

        android:title="@string/status_bar" >



        <com.android.systemui.tuner.StatusBarSwitch
@@ -70,6 +71,7 @@ 




    <PreferenceScreen

        android:key="overview"

        android:title="@string/overview" >



        <com.android.systemui.tuner.TunerSwitch
@@ -97,7 +99,8 @@ 


    <Preference

        android:key="demo_mode"

        android:title="@string/demo_mode" />

        android:title="@string/demo_mode"

        android:fragment="com.android.systemui.tuner.DemoModeFragment" />



    <!-- Warning, this goes last. -->

    <Preference