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

Commit 9fa595f9 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "q_dark_theme" 

* changes:
  Move NightMode to Display settings
  Revert "Setting to change sysui theme"
parents 6098784b a7ea18a6

res/values/arrays.xml

+0 −14
Original line number Diff line number Diff line
@@ -1106,20 +1106,6 @@ 
        <item>no</item>

    </string-array>



    <!-- Titles for SystemUI theme preference. -->

    <string-array name="systemui_theme_entries" >

        <item>@string/systemui_theme_wallpaper</item>

        <item>@string/systemui_theme_light</item>

        <item>@string/systemui_theme_dark</item>

    </string-array>



    <!-- Values for SystemUI theme preference. -->

    <string-array name="systemui_theme_values" translatable="false" >

        <item>0</item>

        <item>1</item>

        <item>2</item>

    </string-array>



    <string-array name="gesture_prevent_ringing_entries" translatable="false">

        <item>@string/prevent_ringing_option_vibrate</item>

        <item>@string/prevent_ringing_option_mute</item>

res/values/strings.xml

+1 −10
Original line number Diff line number Diff line
@@ -9944,21 +9944,12 @@ 
    </string>









    <!-- Name of setting for switching device theme [CHAR LIMIT=60] -->









    <string name="color_theme">Color theme</string>









    <string name="device_theme">Device theme</string>









    <!-- Name of default device theme [CHAR LIMIT=60] -->









    <string name="default_theme">Default</string>









    <!-- Temporary reboot string, will be removed -->









    <string name="change_theme_reboot" translatable="false">Changing the theme requires a restart.</string>

















    <!-- Name of setting for switching the SystemUI theme [CHAR LIMIT=60] -->









    <string name="device_theme">Device theme</string>









    <!-- When SystemUI theme is chosen based on the wallpaper color [CHAR LIMIT=60] -->









    <string name="systemui_theme_wallpaper">Automatic (based on wallpaper)</string>









    <!-- When SystemUI theme is light [CHAR LIMIT=60] -->









    <string name="systemui_theme_light">Light</string>









    <!-- When SystemUI theme is dark [CHAR LIMIT=60] -->









    <string name="systemui_theme_dark">Dark</string>

















    <!-- Switch label to show operator name in the status bar [CHAR LIMIT=60] -->









    <string name="show_operator_name_title">Network name</string>









    <!-- Switch summary to show operator name in the status bar [CHAR LIMIT=NONE] -->

























res/xml/development_settings.xml



+0
−7






























Original line number
Diff line number
Diff line







@@ -108,13 +108,6 @@







            <intent android:action="com.android.settings.action.DEMO_MODE" />









        </Preference>



















        <ListPreference









            android:key="dark_ui_mode"









            android:title="@string/dark_ui_mode"









            android:dialogTitle="@string/dark_ui_mode_title"









            android:entries="@array/dark_ui_mode_entries"









            android:entryValues="@array/dark_ui_mode_values" />



















        <Preference









            android:key="quick_settings_tiles"









            android:title="@string/quick_settings_developer_tiles"
































res/xml/display_settings.xml



+8
−17






























Original line number
Diff line number
Diff line







@@ -108,15 +108,6 @@







        settings:controller="com.android.settings.security.screenlock.LockScreenPreferenceController"









        settings:userRestriction="no_ambient_display" />



















    <!-- Hide night mode for now









    <ListPreference









        android:key="night_mode"









        android:title="@string/night_mode_title"









        settings:keywords="@string/keywords_display_night_mode"









        android:summary="@string/night_mode_summary"









        android:entries="@array/night_mode_entries"









        android:entryValues="@array/night_mode_values" /> -->



















    <SwitchPreference









        android:key="camera_gesture"









        android:title="@string/camera_gesture_title"








@@ -132,17 +123,17 @@







        android:summary="@string/tap_to_wake_summary" />



















    <ListPreference









        android:key="theme"









        android:title="@string/color_theme"









        android:summary="@string/summary_placeholder" />









        android:key="dark_ui_mode"









        android:title="@string/dark_ui_mode"









        android:dialogTitle="@string/dark_ui_mode_title"









        android:entries="@array/dark_ui_mode_entries"









        android:entryValues="@array/dark_ui_mode_values"









        settings:controller="com.android.settings.display.DarkUIPreferenceController" />



















    <ListPreference









        android:key="systemui_theme"









        android:key="theme"









        android:title="@string/device_theme"









        android:entries="@array/systemui_theme_entries"









        android:entryValues="@array/systemui_theme_values"









        settings:controller="com.android.settings.display.SystemUiThemePreferenceController"









        settings:keywords="@string/keywords_systemui_theme" />









        android:summary="@string/summary_placeholder" />



















    <Preference









        android:key="vr_display_pref"
































src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java



+0
−1






























Original line number
Diff line number
Diff line







@@ -386,7 +386,6 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra







        controllers.add(new LocalBackupPasswordPreferenceController(context));









        controllers.add(new StayAwakePreferenceController(context, lifecycle));









        controllers.add(new HdcpCheckingPreferenceController(context));









        controllers.add(new DarkUIPreferenceController(context));









        controllers.add(new BluetoothSnoopLogPreferenceController(context));









        controllers.add(new OemUnlockPreferenceController(context, activity, fragment));









        controllers.add(new FileEncryptionPreferenceController(context));