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

Commit d8200e80 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents ac73d4e7 50a6b242

res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -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>

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

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









    <string name="screen_timeout">Sleep</string>
































res/xml/night_display_settings.xml



+2
−1






























Original line number
Diff line number
Diff line







@@ -41,7 +41,8 @@







        android:key="night_display_temperature"









        android:title="@string/night_display_temperature_title"









        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









        android:key="night_display_activated"