Merge changes from topic "hub-mode-settings" into tm-qpr-dev
* changes: Add top-level Communal settings. Change screensaver ctrlr to base pref ctrlr.
This commit is contained in:
@@ -622,6 +622,9 @@
|
||||
<!-- Whether the dream setup activity should be enabled as part of setupwizard -->
|
||||
<bool name="dream_setup_supported">false</bool>
|
||||
|
||||
<!-- Whether to show communal settings at the top level. -->
|
||||
<bool name="config_show_communal_settings">false</bool>
|
||||
|
||||
<!-- Whether to put the apps with system UID into system component bucket or not -->
|
||||
<bool name="config_battery_combine_system_components">false</bool>
|
||||
|
||||
|
@@ -17,6 +17,7 @@
|
||||
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
|
||||
|
||||
<string name="menu_key_network" translatable="false">top_level_network</string>
|
||||
<string name="menu_key_communal" translatable="false">top_level_communal</string>
|
||||
<string name="menu_key_connected_devices" translatable="false">top_level_connected_devices</string>
|
||||
<string name="menu_key_apps" translatable="false">top_level_apps</string>
|
||||
<string name="menu_key_notifications" translatable="false">top_level_notifications</string>
|
||||
|
@@ -4019,6 +4019,12 @@
|
||||
<!-- Phone info screen, section titles: -->
|
||||
<string name="battery_level_title">Battery level</string>
|
||||
|
||||
<!-- Communal Settings -->
|
||||
<!-- Title of the communal settings under Settings > Communal [CHAR LIMIT=30] -->
|
||||
<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>
|
||||
|
||||
<!-- APN Settings -->
|
||||
<!-- APN settings screen title -->
|
||||
<string name="apn_settings">APNs</string>
|
||||
|
Reference in New Issue
Block a user