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

Commit d81e2c36 authored by Yi Jiang's avatar Yi Jiang Committed by Android (Google) Code Review
Browse files

Merge "use different description strings for screen attention settings and... 

Merge "use different description strings for screen attention settings and contextual card" into qt-r1-dev
parents 559a72e2 9df180a0

res/values/strings.xml

+4 −3
Original line number Diff line number Diff line
@@ -2829,14 +2829,15 @@ 
    <!-- Display settings screen, setting option name to enable adaptive sleep [CHAR LIMIT=30] -->

    <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’t turn off if you’re looking at it</string>

    <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] -->

    <string name="adaptive_sleep_summary_off">Off</string>

    <!-- Description about the feature adaptive sleep [CHAR LIMIT=NONE]-->

    <string name="adaptive_sleep_description">Keep screen on when viewing it</string>

    <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>









    <!-- Description about the contextual adaptive sleep card [CHAR LIMIT=NONE]-->









    <string name="adaptive_sleep_contextual_slice_summary">Keep screen on when viewing it</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>
































src/com/android/settings/homepage/contextualcards/slices/ContextualAdaptiveSleepSlice.java



+2
−1






























Original line number
Diff line number
Diff line







@@ -80,7 +80,8 @@ public class ContextualAdaptiveSleepSlice implements CustomSliceable {







            final IconCompat icon = IconCompat.createWithResource(mContext,









                    R.drawable.ic_settings_adaptive_sleep);









            final CharSequence title = mContext.getText(R.string.adaptive_sleep_title);









            final CharSequence subtitle = mContext.getText(R.string.adaptive_sleep_description);









            final CharSequence subtitle = mContext.getText(









                    R.string.adaptive_sleep_contextual_slice_summary);



















            final SliceAction pAction = SliceAction.createDeeplink(getPrimaryAction(),









                    icon,