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

Commit 9d140716 authored by Edgar Wang's avatar Edgar Wang Committed by Android (Google) Code Review
Browse files

Merge "Apply SettingsPreferenceTheme in Settings" into sc-dev

parents fce594ad 817a1674

res/values/styles_preference.xml

+2 −2
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
<!-- Things unrelated to preference framework UI customization should go to other styles files -->

<resources>



    <style name="PreferenceTheme" parent="@style/PreferenceThemeOverlay.SettingsBase">

    <style name="SettingsPreferenceTheme" parent="@style/PreferenceTheme.SettingsBase">

        <item name="apnPreferenceStyle">@style/ApnPreference</item>

        <item name="cardPreferenceStyle">@style/CardPreference</item>

        <item name="slicePreferenceStyle">@style/SlicePreference</item>
@@ -28,7 +28,7 @@ 
        <item name="preferenceFragmentCompatStyle">@style/SettingsPreferenceFragmentStyle</item>

    </style>



    <style name="PreferenceTheme.SetupWizard">

    <style name="PreferenceTheme.SetupWizard" parent="@style/SettingsPreferenceTheme">

        <item name="preferenceFragmentCompatStyle">@style/SetupWizardPreferenceFragmentStyle</item>

        <item name="preferenceStyle">@style/Preference.Material</item>

    </style>

res/values/themes.xml

+2 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
    <style name="Theme.Settings" parent="Theme.SettingsBase">

        <item name="android:clipToPadding">false</item>

        <item name="android:clipChildren">false</item>

        <item name="preferenceTheme">@style/SettingsPreferenceTheme</item>

        <item name="android:listPreferredItemHeight">72dip</item>

        <item name="android:homeAsUpIndicator">@drawable/ic_arrow_back</item>

        <item name="android:navigationBarColor">@android:color/transparent</item>
@@ -207,7 +208,7 @@ 
    <style name="Theme.Settings.HomeBase" parent="Theme.Settings.NoActionBar">

        <item name="colorPrimary">@*android:color/primary_device_default_settings_light</item>

        <item name="colorAccent">@*android:color/accent_device_default_light</item>

        <item name="preferenceTheme">@style/PreferenceTheme</item>

        <item name="preferenceTheme">@style/SettingsPreferenceTheme</item>



        <!-- action bar, needed for search bar icon tinting -->

        <item name="android:actionBarTheme">@*android:style/ThemeOverlay.DeviceDefault.ActionBar</item>

res/values/themes_suw.xml

+1 −1
Original line number Diff line number Diff line
@@ -196,7 +196,7 @@ 
        <item name="android:colorPrimary">@color/material_grey_100</item>

        <item name="android:colorAccent">@color/material_blue_700</item>

        <item name="android:titleTextColor">@color/material_blue_700</item>

        <item name="preferenceTheme">@style/PreferenceTheme</item>

        <item name="preferenceTheme">@style/SettingsPreferenceTheme</item>

        <item name="switchBarTheme">@style/ThemeOverlay.SwitchBar.Settings</item>

    </style>

tests/robotests/res/values/themes.xml

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
        <item name="colorPrimary">#ffffff</item>

        <item name="colorPrimaryDark">#ffffff</item>

        <item name="colorAccent">#ffffff</item>

        <item name="preferenceTheme">@style/PreferenceTheme</item>

        <item name="preferenceTheme">@style/SettingsPreferenceTheme</item>

        <item name="android:windowLightStatusBar">true</item>

        <!-- Define this color for material design -->

        <item name="colorPrimaryVariant">@android:color/white</item>

tests/robotests/src/com/android/settings/display/ScreenTimeoutSettingsTest.java

+5 −0
Original line number Diff line number Diff line
@@ -73,6 +73,9 @@ public class ScreenTimeoutSettingsTest { 
    @Mock

    AdaptiveSleepPreferenceController mAdaptiveSleepPreferenceController;



    @Mock

    AdaptiveSleepCameraStatePreferenceController mAdaptiveSleepCameraStatePreferenceController;



    @Mock

    Preference mDisableOptionsPreference;
@@ -98,6 +101,8 @@ public class ScreenTimeoutSettingsTest { 


        mSettings.mAdaptiveSleepController = mAdaptiveSleepPreferenceController;

        mSettings.mAdaptiveSleepPermissionController = mPermissionPreferenceController;

        mSettings.mAdaptiveSleepCameraStatePreferenceController =

                mAdaptiveSleepCameraStatePreferenceController;

    }



    @Test