Merge "Move hub mode settings under display." into main

This commit is contained in:
William Leshner
2025-03-11 14:50:35 -07:00
committed by Android (Google) Code Review
11 changed files with 458 additions and 44 deletions

View File

@@ -1059,6 +1059,20 @@
<item>either_charging_or_docked</item>
</string-array>
<string-array name="when_to_start_hubmode_entries" translatable="false">
<item>@string/when_to_show_hubmode_never</item>
<item>@string/when_to_show_hubmode_charging</item>
<item>@string/when_to_show_hubmode_charging_and_upright</item>
<item>@string/when_to_show_hubmode_docked</item>
</string-array>
<string-array name="when_to_start_hubmode_values" translatable="false">
<item>never</item>
<item>while_charging</item>
<item>while_charging_and_upright</item>
<item>while_docked</item>
</string-array>
<string-array name="zen_mode_contacts_calls_entries" translatable="false">
<item>@string/zen_mode_from_anyone</item>
<item>@string/zen_mode_from_contacts</item>

View File

@@ -3655,6 +3655,21 @@
<string name="communal_settings_title">Communal</string>
<!-- Summary of the communal settings under Settings > Communal [CHAR LIMIT=50] -->
<string name="communal_settings_summary">Communal settings</string>
<!-- Title of Hub mode category [CHAR LIMIT=30] -->
<string name="hub_mode_category_title">Hub mode</string>
<!-- Title of the "widgets on lockscreen" settings page. [CHAR LIMIT=NONE] -->
<string name="widgets_on_lockscreen_title">Widgets on lock screen</string>
<!-- Title of a setting to control when to automatically show widgets on the lockscren. [CHAR LIMIT=NONE] -->
<string name="when_to_auto_show_hubmode_title">When to automatically show</string>
<!-- Summary for when to automatically show hub mode (widgets on lockscreen): never [CHAR LIMIT=100] -->
<string name="when_to_show_hubmode_never">Never</string>
<!-- Summary for when to automatically show hub mode (widgets on lockscreen): charging [CHAR LIMIT=100] -->
<string name="when_to_show_hubmode_charging">While charging</string>
<!-- Summary for when to automatically show hub mode (widgets on lockscreen): charging and upright [CHAR LIMIT=100] -->
<string name="when_to_show_hubmode_charging_and_upright">While charging and upright</string>
<!-- Summary for when to automatically show hub mode (widgets on lockscreen): docked [CHAR LIMIT=100] -->
<string name="when_to_show_hubmode_docked">While docked</string>
<!-- _satellite_setting_preference_layout -->
<!-- _satellite_setting_preference_layout screen title-->