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

Update string for Adaptive sleep slice title.

Browse Source 
The previous change of the slice title will also impact the title in
Display setting, so this CL creates a new string for the slice title and
revert the change of the normal preference.

Fixes: 151746621
Test: check the titile on Adaptive sleep slice and Display setting.
Change-Id: I2955f4c78b7bf689078deaabcc4148bd5e37b573
This commit is contained in:
Yi-Ling Chuang
2020-03-19 16:38:00 +08:00
parent fbde0b3b39
commit 617e86c0a2
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/values/strings.xml
View File

@@ -2742,7 +2742,7 @@
<!-- 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] -->
<string name="adaptive_sleep_title">Turn on screen attention</string>
<string name="adaptive_sleep_title">Screen attention</string>
<!-- Setting option summary when adaptive sleep is on [CHAR LIMIT=NONE] -->
<string name="adaptive_sleep_summary_on">On / Screen won\u2019t turn off if you\u2019re looking at it</string>
<!-- Setting option summary when adaptive sleep is off [CHAR LIMIT=NONE] -->
@@ -2755,6 +2755,8 @@
<string name="adaptive_sleep_description">Prevents your screen from turning off if you\u2019re looking at it</string>
<!-- Description feature's privacy sensitive details to make sure users understand what feature users, what it saves/sends etc [CHAR LIMIT=NONE]-->
<string name="adaptive_sleep_privacy">Screen attention uses the front camera to see if someone is looking at the screen. It works on device, and images are never stored or sent to Google.</string>
<!-- Title of the contextual adaptive sleep card [CHAR LIMIT=NONE]-->
<string name="adaptive_sleep_contextual_slice_title">Turn on screen attention</string>
<!-- Description about the contextual adaptive sleep card [CHAR LIMIT=NONE]-->
<string name="adaptive_sleep_contextual_slice_summary">Keep screen on when looking at it</string>

3
src/com/android/settings/homepage/contextualcards/slices/ContextualAdaptiveSleepSlice.java
View File

@@ -81,7 +81,8 @@ public class ContextualAdaptiveSleepSlice implements CustomSliceable {
if (isSettingsAvailable() && !isUserInteracted() && !isRecentlySetup() && !isTurnedOn()) {
final IconCompat icon = IconCompat.createWithResource(mContext,
R.drawable.ic_settings_adaptive_sleep);
final CharSequence title = mContext.getText(R.string.adaptive_sleep_title);
final CharSequence title =
mContext.getText(R.string.adaptive_sleep_contextual_slice_title);
final CharSequence subtitle = mContext.getText(
R.string.adaptive_sleep_contextual_slice_summary);