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

Commit c6a63916 authored by Tsung-Mao Fang's avatar Tsung-Mao Fang Committed by Android (Google) Code Review
Browse files

Merge "Rearrange settings in Display page"

parents 4fe99f19 aee0cb58

res/values/strings.xml

+11 −0
Original line number Diff line number Diff line
@@ -12562,4 +12562,15 @@ 
    <string name="bluetooth_phonebook_access_dialog_title">Allow access to contacts and call log?</string>

    <!-- Bluetooth phonebook permission alert for dialog content [CHAR LIMIT=none] -->

    <string name="bluetooth_phonebook_access_dialog_content">An untrusted Bluetooth device, <xliff:g id="device_name" example="My device">%1$s</xliff:g>, wants to access your contacts and call log. This includes data about incoming and outgoing calls.\n\nYou haven\u2019t connected to <xliff:g id="device_name" example="My device">%2$s</xliff:g> before.</string>









    <!-- Brightness category name in Display Settings [CHAR LIMIT=none] -->









    <string name="category_name_brightness">Brightness</string>









    <!-- Lock screen category name in Display Settings [CHAR LIMIT=none] -->









    <string name="category_name_lock_display">Lock Display</string>









    <!-- Visibility category name in Display Settings [CHAR LIMIT=none] -->









    <string name="category_name_visibility">Visibility</string>









    <!-- Color category name in Display Settings [CHAR LIMIT=none] -->









    <string name="category_name_color">Color</string>









    <!-- Others category name [CHAR LIMIT=none] -->









    <string name="category_name_others">Others</string>









</resources>

























res/xml/display_settings_v2.xml



+138
−121






























Original line number
Diff line number
Diff line







@@ -19,8 +19,10 @@







    xmlns:settings="http://schemas.android.com/apk/res-auto"









    android:key="display_settings_screen"









    android:title="@string/display_settings"









    settings:keywords="@string/keywords_display"









    settings:initialExpandedChildrenCount="5">









    settings:keywords="@string/keywords_display">



















    <PreferenceCategory









        android:title="@string/category_name_brightness">



















        <com.android.settingslib.RestrictedPreference









            android:key="brightness"








@@ -31,6 +33,35 @@







            <intent android:action="com.android.intent.action.SHOW_BRIGHTNESS_DIALOG"/>









        </com.android.settingslib.RestrictedPreference>



















        <Preference









            android:key="auto_brightness_entry"









            android:title="@string/auto_brightness_title"









            android:summary="@string/summary_placeholder"









            android:fragment="com.android.settings.display.AutoBrightnessSettings"









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









    </PreferenceCategory>



















    <PreferenceCategory









        android:title="@string/category_name_lock_display">



















        <Preference









            android:key="lockscreen_from_display_settings"









            android:title="@string/lockscreen_settings_title"









            android:fragment="com.android.settings.security.LockscreenDashboardFragment"









            settings:keywords="@string/keywords_ambient_display_screen"









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



















        <com.android.settingslib.RestrictedPreference









            android:key="screen_timeout"









            android:title="@string/screen_timeout"









            android:summary="@string/summary_placeholder"









            android:fragment="com.android.settings.display.ScreenTimeoutSettings"









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









    </PreferenceCategory>



















    <PreferenceCategory









        android:title="@string/category_name_visibility">



















        <com.android.settings.display.darkmode.DarkModePreference









            android:key="dark_ui_mode"









            android:title="@string/dark_ui_mode"








@@ -40,6 +71,22 @@







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









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



















        <Preference









            android:key="font_size"









            android:title="@string/title_font_size"









            android:fragment="com.android.settings.display.ToggleFontSizePreferenceFragment"









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









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



















        <com.android.settings.display.ScreenZoomPreference









            android:key="display_settings_screen_zoom"









            android:title="@string/screen_zoom_title"









            android:fragment="com.android.settings.display.ScreenZoomSettings"/>









    </PreferenceCategory>



















    <PreferenceCategory









        android:title="@string/category_name_color">



















        <com.android.settings.widget.PrimarySwitchPreference









            android:key="night_display"









            android:title="@string/night_display_title"








@@ -48,19 +95,15 @@







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



















        <Preference









        android:key="auto_brightness_entry"









        android:title="@string/auto_brightness_title"









        android:summary="@string/summary_placeholder"









        android:fragment="com.android.settings.display.AutoBrightnessSettings"









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









            android:key="color_mode"









            android:title="@string/color_mode_title"









            android:fragment="com.android.settings.display.ColorModePreferenceFragment"









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









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









    </PreferenceCategory>



















    <!-- Cross-listed item, if you change this, also change it in power_usage_summary.xml -->









    <com.android.settingslib.RestrictedPreference









        android:key="screen_timeout"









        android:title="@string/screen_timeout"









        android:summary="@string/summary_placeholder"









        android:fragment="com.android.settings.display.ScreenTimeoutSettings"









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









    <PreferenceCategory









        android:title="@string/category_name_others">



















        <SwitchPreference









            android:key="auto_rotate"








@@ -68,13 +111,6 @@







            settings:keywords="@string/keywords_auto_rotate"









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



















    <Preference









        android:key="color_mode"









        android:title="@string/color_mode_title"









        android:fragment="com.android.settings.display.ColorModePreferenceFragment"









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









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



















        <SwitchPreference









            android:key="display_white_balance"









            android:title="@string/display_white_balance_title"








@@ -87,18 +123,6 @@







            android:summary="@string/peak_refresh_rate_summary"









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



















    <Preference









        android:key="font_size"









        android:title="@string/title_font_size"









        android:fragment="com.android.settings.display.ToggleFontSizePreferenceFragment"









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









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



















    <com.android.settings.display.ScreenZoomPreference









        android:key="display_settings_screen_zoom"









        android:title="@string/screen_zoom_title"









        android:fragment="com.android.settings.display.ScreenZoomSettings"/>



















        <SwitchPreference









            android:key="show_operator_name"









            android:title="@string/show_operator_name_title"








@@ -109,13 +133,6 @@







            android:title="@string/screensaver_settings_title"









            android:fragment="com.android.settings.dream.DreamSettings"/>



















    <Preference









        android:key="lockscreen_from_display_settings"









        android:title="@string/lockscreen_settings_title"









        android:fragment="com.android.settings.security.LockscreenDashboardFragment"









        settings:keywords="@string/keywords_ambient_display_screen"









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



















        <SwitchPreference









            android:key="camera_gesture"









            android:title="@string/camera_gesture_title"








@@ -139,5 +156,5 @@







            android:key="vr_display_pref"









            android:title="@string/display_vr_pref_title"









            android:fragment="com.android.settings.display.VrDisplayPreferencePicker"/>



















    </PreferenceCategory>









</PreferenceScreen>