Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Gives unvailable slice of Night Light a customized subtitle"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-01-19 08:12:55 +00:00
committed by Android (Google) Code Review
parent ac73d4e721 50a6b24222
commit d8200e80af
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -2724,6 +2724,8 @@
<string name="night_display_activation_on_custom">Turn on until <xliff:g name="time" example="6 AM">%1$s</xliff:g></string> <string name="night_display_activation_on_custom">Turn on until <xliff:g name="time" example="6 AM">%1$s</xliff:g></string>
<!-- Display settings screen, deactivation button action for custom schedule [CHAR LIMIT=40] --> <!-- Display settings screen, deactivation button action for custom schedule [CHAR LIMIT=40] -->
<string name="night_display_activation_off_custom">Turn off until <xliff:g name="time" example="10 PM">%1$s</xliff:g></string> <string name="night_display_activation_off_custom">Turn off until <xliff:g name="time" example="10 PM">%1$s</xliff:g></string>
<!-- Night display slice screen, subtitle of intensity setting when night light is off. [CHAR LIMIT=30] -->
<string name="night_display_not_currently_on">Night Light not currently on</string>
<!-- Sound & display settings screen, setting option name to change screen timeout --> <!-- Sound & display settings screen, setting option name to change screen timeout -->
<string name="screen_timeout">Sleep</string> <string name="screen_timeout">Sleep</string>

3
res/xml/night_display_settings.xml
View File

@@ -41,7 +41,8 @@
android:key="night_display_temperature" android:key="night_display_temperature"
android:title="@string/night_display_temperature_title" android:title="@string/night_display_temperature_title"
settings:keywords="@string/keywords_display_night_display" settings:keywords="@string/keywords_display_night_display"
settings:controller="com.android.settings.display.NightDisplayIntensityPreferenceController" /> settings:controller="com.android.settings.display.NightDisplayIntensityPreferenceController"
settings:unavailableSliceSubtitle="@string/night_display_not_currently_on" />
<com.android.settingslib.widget.LayoutPreference <com.android.settingslib.widget.LayoutPreference
android:key="night_display_activated" android:key="night_display_activated"