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

Merge "Remove night display headers and change strings"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-06-01 06:45:13 +00:00
committed by Android (Google) Code Review
parent fca1b78d94 2935f3eb6d
commit 8306791889
2 changed files with 30 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
res/values/strings.xml
View File

@@ -2373,40 +2373,38 @@
<string name="night_display_title">Night Light</string>
<!-- Night display screen, description of night display feature (renamed "Night Light" with title caps). [CHAR LIMIT=NONE] -->
<string name="night_display_text">Night Light tints your screen amber. This makes it easier to look at your screen or read in dim light, and may help you fall asleep more easily.</string>
<!-- Night display screen, category title for settings to schedule when night display activates automatically. [CHAR LIMIT=30] -->
<string name="night_display_category_schedule">Schedule</string>
<!-- Night display screen, category title for settings to manually activate night display. [CHAR LIMIT=30] -->
<string name="night_display_category_status">Status</string>
<!-- Night display screen, setting option name to configure whether night display turn on/off automatically. [CHAR LIMIT=30] -->
<string name="night_display_auto_mode_title">Turn on automatically</string>
<string name="night_display_auto_mode_title">Schedule</string>
<!-- Night display screen, setting option value for night display to *never* turn on/off automatically. [CHAR LIMIT=30] -->
<string name="night_display_auto_mode_never">Never</string>
<!-- Night display screen, setting option value for night display to turn on/off automatically according to a user defined schedule. [CHAR LIMIT=30] -->
<string name="night_display_auto_mode_custom">Custom schedule</string>
<!-- Night display screen, setting option value for night display to turn on/off automatically at sunset/sunrise. [CHAR LIMIT=30] -->
<string name="night_display_auto_mode_twilight">Sunset to sunrise</string>
<string name="night_display_auto_mode_never">None</string>
<!-- Night display screen, setting option value for night display to turn on/off automatically according to a user defined schedule. [CHAR LIMIT=32] -->
<string name="night_display_auto_mode_custom">Turns on at custom time</string>
<!-- Night display screen, setting option value for night display to turn on/off automatically at sunset/sunrise. [CHAR LIMIT=32] -->
<string name="night_display_auto_mode_twilight">Turns on from sunset to sunrise</string>
<!-- Night display screen, setting option name to configure time to automatically turn on night display. [CHAR LIMIT=30] -->
<string name="night_display_start_time_title">Start time</string>
<!-- Night display screen, setting option name to configure time to automatically turn off night display. [CHAR LIMIT=30] -->
<string name="night_display_end_time_title">End time</string>
<!-- Night display screen, setting option name controlling the current activation status. [CHAR LIMIT=30] -->
<string name="night_display_status_title">Status</string>
<!-- Night display screen, setting the color temperature of the display. [CHAR LIMIT=30] -->
<string name="night_display_temperature_title">Intensity</string>
<!-- Display settings screen, summary format of night display when off. [CHAR LIMIT=NONE] -->
<string name="night_display_summary_off">Off. <xliff:g name="auto_mode_summary" example="Never turn on automatically">%1$s</xliff:g></string>
<string name="night_display_summary_off">Off / <xliff:g name="auto_mode_summary" example="Never turn on automatically">%1$s</xliff:g></string>
<!-- Display settings screen, summary of night display when off and will *never* turn on automatically. [CHAR LIMIT=NONE] -->
<string name="night_display_summary_off_auto_mode_never">Will never turn on automatically.</string>
<string name="night_display_summary_off_auto_mode_never">Will never turn on automatically</string>
<!-- Display settings screen, summary format of night display when off and will turn on automatically at a user defined time. [CHAR LIMIT=NONE] -->
<string name="night_display_summary_off_auto_mode_custom">Will turn on automatically at <xliff:g name="time" example="6 AM">%1$s</xliff:g>.</string>
<string name="night_display_summary_off_auto_mode_custom">Will turn on automatically at <xliff:g name="time" example="6 AM">%1$s</xliff:g></string>
<!-- Display settings screen, summary of night display when off and will turn on automatically at sunset. [CHAR LIMIT=NONE] -->
<string name="night_display_summary_off_auto_mode_twilight">Will turn on automatically at sunset.</string>
<string name="night_display_summary_off_auto_mode_twilight">Will turn on automatically at sunset</string>
<!-- Display settings screen, summary format of night display when on. [CHAR LIMIT=NONE] -->
<string name="night_display_summary_on">On. <xliff:g name="auto_mode_summary" example="Never turn off automatically">%1$s</xliff:g></string>
<string name="night_display_summary_on">On / <xliff:g name="auto_mode_summary" example="Never turn off automatically">%1$s</xliff:g></string>
<!-- Display settings screen, summary of night display when on and will *never* turn off automatically. [CHAR LIMIT=NONE] -->
<string name="night_display_summary_on_auto_mode_never">Will never turn off automatically.</string>
<string name="night_display_summary_on_auto_mode_never">Will never turn off automatically</string>
<!-- Display settings screen, summary format of night display when on and will turn off automatically at a user defined time. [CHAR LIMIT=NONE] -->
<string name="night_display_summary_on_auto_mode_custom">Will turn off automatically at <xliff:g name="time" example="10 PM">%1$s</xliff:g>.</string>
<string name="night_display_summary_on_auto_mode_custom">Will turn off automatically at <xliff:g name="time" example="10 PM">%1$s</xliff:g></string>
<!-- Display settings screen, summary of night display when on and will turn off automatically at sunrise. [CHAR LIMIT=NONE] -->
<string name="night_display_summary_on_auto_mode_twilight">Will turn off automatically at sunrise.</string>
<string name="night_display_summary_on_auto_mode_twilight">Will turn off automatically at sunrise</string>
<!-- Sound & display settings screen, setting option name to change screen timeout -->
<string name="screen_timeout">Sleep</string>

38
res/xml/night_display_settings.xml
View File

@@ -18,35 +18,25 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:title="@string/night_display_title">
<PreferenceCategory
android:title="@string/night_display_category_schedule">
<DropDownPreference
android:key="night_display_auto_mode"
android:title="@string/night_display_auto_mode_title"
android:summary="%s" />
<DropDownPreference
android:key="night_display_auto_mode"
android:title="@string/night_display_auto_mode_title"
android:summary="%s" />
<Preference
android:key="night_display_start_time"
android:title="@string/night_display_start_time_title" />
<Preference
android:key="night_display_start_time"
android:title="@string/night_display_start_time_title" />
<Preference
android:key="night_display_end_time"
android:title="@string/night_display_end_time_title" />
<Preference
android:key="night_display_end_time"
android:title="@string/night_display_end_time_title" />
<com.android.settings.display.NightDisplayPreference
android:key="night_display_activated"
android:title="@string/night_display_status_title" />
</PreferenceCategory>
<PreferenceCategory
android:title="@string/night_display_category_status">
<com.android.settings.display.NightDisplayPreference
android:key="night_display_activated"
android:title="@string/night_display_title" />
<com.android.settings.widget.SeekBarPreference
<com.android.settings.widget.SeekBarPreference
android:key="night_display_temperature"
android:title="@string/night_display_temperature_title"/>
</PreferenceCategory>
</PreferenceScreen>