Merge "Add dark theme custom type into the dark theme settings page"
This commit is contained in:
committed by
Android (Google) Code Review
commit
0ae266c6fb
@@ -110,6 +110,18 @@
|
||||
<item>@string/dark_ui_auto_mode_auto</item>
|
||||
</string-array>
|
||||
|
||||
<!-- Dark theme scheduling preferences [CHAR LIMIT=NONE] -->
|
||||
<string-array name="dark_ui_scheduler_with_bedtime_preference_titles">
|
||||
<!-- 0: None -->
|
||||
<item>@string/dark_ui_auto_mode_never</item>
|
||||
<!-- 1: Custom -->
|
||||
<item>@string/dark_ui_auto_mode_custom</item>
|
||||
<!-- 2: Auto -->
|
||||
<item>@string/dark_ui_auto_mode_auto</item>
|
||||
<!-- 3: Bedtime -->
|
||||
<item>@string/dark_ui_auto_mode_custom_bedtime</item>
|
||||
</string-array>
|
||||
|
||||
<!-- Security settings. The delay after screen is turned off until device locks.
|
||||
These are shown in a list dialog. -->
|
||||
<string-array name="lock_after_timeout_entries">
|
||||
|
@@ -3077,6 +3077,8 @@
|
||||
<string name="dark_ui_auto_mode_auto">Turns on from sunset to sunrise</string>
|
||||
<!-- Dark UI screen, setting option value for Dark theme to turn on/off automatically according to a user defined schedule. [CHAR LIMIT=32] -->
|
||||
<string name="dark_ui_auto_mode_custom">Turns on at custom time</string>
|
||||
<!-- Dark UI screen, setting option value for Dark theme to turn on/off automatically according to a user bedtime schedule. [CHAR LIMIT=40] -->
|
||||
<string name="dark_ui_auto_mode_custom_bedtime">Turns on at bedtime</string>
|
||||
<!-- Dark UI screen, setting option name controlling the current activation status. [CHAR LIMIT=30] -->
|
||||
<string name="dark_ui_status_title">Status</string>
|
||||
<!-- Display settings screen, summary of Dark UI when off and will *never* turn on automatically. [CHAR LIMIT=NONE] -->
|
||||
@@ -3085,18 +3087,27 @@
|
||||
<string name="dark_ui_summary_off_auto_mode_auto">Will turn on automatically at sunset</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="dark_ui_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 Dark UI when off and will turn on automatically at bedtime. [CHAR LIMIT=NONE] -->
|
||||
<string name="dark_ui_summary_off_auto_mode_custom_bedtime">Will turn on automatically at bedtime</string>
|
||||
<!-- Display settings screen, summary of Dark UI when on and will *never* turn off automatically. [CHAR LIMIT=NONE] -->
|
||||
<string name="dark_ui_summary_on_auto_mode_never">Will never turn off automatically</string>
|
||||
<!-- Display settings screen, summary of Dark UI when on and will turn off automatically at sunrise. [CHAR LIMIT=NONE] -->
|
||||
<string name="dark_ui_summary_on_auto_mode_auto">Will turn off automatically at sunrise</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="dark_ui_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 Dark UI when on and will turn off automatically after bedtime. [CHAR LIMIT=NONE] -->
|
||||
<string name="dark_ui_summary_on_auto_mode_custom_bedtime">Will turn off automatically after bedtime</string>
|
||||
<!-- Display settings screen, activation button action for custom schedule [CHAR LIMIT=40] -->
|
||||
<string name="dark_ui_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="dark_ui_activation_off_custom">Turn off until <xliff:g name="time" example="10 PM">%1$s</xliff:g></string>
|
||||
<!-- Dark theme screen, description of Dark theme feature. [CHAR LIMIT=NONE] -->
|
||||
<string name="dark_ui_text">Dark theme uses a black background to help keep battery alive longer on some screens. Dark theme schedules wait to turn on until your screen is off.</string>
|
||||
<!-- Dark UI screen footer summary text shown when the when Dark theme turns on/off automatically according to a user bedtime schedule. [CHAR LIMIT=NONE] -->
|
||||
<string name="dark_ui_bedtime_footer_summary">Dark theme is currently following your Bedtime mode schedule</string>
|
||||
<!-- Dark UI screen footer action text shown when the when Dark theme turns on/off automatically according to a user bedtime schedule. [CHAR LIMIT=NONE] -->
|
||||
<string name="dark_ui_bedtime_footer_action">Bedtime mode settings</string>
|
||||
|
||||
|
||||
<!-- Sound & display settings screen, setting option name to change screen timeout -->
|
||||
<string name="screen_timeout">Screen timeout</string>
|
||||
|
Reference in New Issue
Block a user