Merge "Add display white balance setting"

This commit is contained in:
Christine Franks
2019-01-03 16:25:28 +00:00
committed by Android (Google) Code Review
4 changed files with 132 additions and 0 deletions

View File

@@ -2646,6 +2646,9 @@
<!-- Description about the feature adaptive brightness -->
<string name="auto_brightness_description">Your screen brightness will automatically adjust to your environment and activities. You can move the slider manually to help adaptive brightness learn your preferences.</string>
<!-- Display settings screen, display white balance settings title [CHAR LIMIT=30] -->
<string name="display_white_balance_title">Display white balance</string>
<!-- Night display screen, setting option name to enable night display (renamed "Night Light" with title caps). [CHAR LIMIT=30] -->
<string name="night_display_title">Night Light</string>
<!-- Night display screen, description of night display feature (renamed "Night Light" with title caps). [CHAR LIMIT=NONE] -->

View File

@@ -79,6 +79,11 @@
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"
settings:controller="com.android.settings.display.DisplayWhiteBalancePreferenceController" />
<Preference
android:key="font_size"
android:title="@string/title_font_size"