PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add summary for white balance feature" into qt-r1-dev am: 9cd8167bff

Browse Source 
am: ef24931fd8

Change-Id: I9b205093afd8e9280b529fdc64e6b6c70cc94a77
This commit is contained in:
tmfang
2019-06-29 04:58:32 -07:00
committed by android-build-merger
parent 5328bb34bf ef24931fd8
commit 32600e06d1
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -2824,6 +2824,8 @@
<!-- Display settings screen, display white balance settings title [CHAR LIMIT=30] --> <!-- Display settings screen, display white balance settings title [CHAR LIMIT=30] -->
<string name="display_white_balance_title">Display white balance</string> <string name="display_white_balance_title">Display white balance</string>
<!-- Display settings screen, display white balance settings summary [CHAR LIMIT=NONE] -->
<string name="display_white_balance_summary"></string>
<!-- Display settings screen, setting option name to enable adaptive sleep [CHAR LIMIT=30] --> <!-- Display settings screen, setting option name to enable adaptive sleep [CHAR LIMIT=30] -->
<string name="adaptive_sleep_title">Screen attention</string> <string name="adaptive_sleep_title">Screen attention</string>
<!-- Setting option summary when adaptive sleep is on [CHAR LIMIT=NONE] --> <!-- Setting option summary when adaptive sleep is on [CHAR LIMIT=NONE] -->

1
res/xml/display_settings.xml
View File

@@ -93,6 +93,7 @@
<SwitchPreference <SwitchPreference
android:key="display_white_balance" android:key="display_white_balance"
android:title="@string/display_white_balance_title" android:title="@string/display_white_balance_title"
android:summary="@string/display_white_balance_summary"
settings:controller="com.android.settings.display.DisplayWhiteBalancePreferenceController" /> settings:controller="com.android.settings.display.DisplayWhiteBalancePreferenceController" />
<Preference <Preference