From 65836b1e3db74b29250b913f433dd6cb17c3b9c2 Mon Sep 17 00:00:00 2001 From: Darrell Shi Date: Wed, 14 Dec 2022 16:46:48 +0000 Subject: [PATCH] Add top-level Communal settings. This change adds a new top-level setting, of which the availability is controlled by a build time config value. It also registers the new communal category so that prebuilt packages can inject preferences into it. Bug: 261641080 Test: verified on device that communal settings show up on top level Test: atest ScreenSaverPreferenceControllerTest Change-Id: Idf79ae5b89ecc3498373de56a677b4876fb121c3 --- res/drawable/ia_settings_communal.xml | 24 ++++++++++ res/values/config.xml | 3 ++ res/values/menu_keys.xml | 1 + res/values/strings.xml | 6 +++ res/xml/communal_settings.xml | 20 +++++++++ res/xml/top_level_settings.xml | 10 +++++ .../communal/CommunalDashboardFragment.java | 44 +++++++++++++++++++ .../CommunalPreferenceController.java | 37 ++++++++++++++++ .../dashboard/DashboardFragmentRegistry.java | 3 ++ 9 files changed, 148 insertions(+) create mode 100644 res/drawable/ia_settings_communal.xml create mode 100644 res/xml/communal_settings.xml create mode 100644 src/com/android/settings/communal/CommunalDashboardFragment.java create mode 100644 src/com/android/settings/communal/CommunalPreferenceController.java diff --git a/res/drawable/ia_settings_communal.xml b/res/drawable/ia_settings_communal.xml new file mode 100644 index 00000000000..14642c9a168 --- /dev/null +++ b/res/drawable/ia_settings_communal.xml @@ -0,0 +1,24 @@ + + + + + diff --git a/res/values/config.xml b/res/values/config.xml index e3b8618f482..4aa41425ce6 100755 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -622,6 +622,9 @@ false + + false + false diff --git a/res/values/menu_keys.xml b/res/values/menu_keys.xml index 2841b699c97..27e9639122a 100755 --- a/res/values/menu_keys.xml +++ b/res/values/menu_keys.xml @@ -17,6 +17,7 @@ top_level_network + top_level_communal top_level_connected_devices top_level_apps top_level_notifications diff --git a/res/values/strings.xml b/res/values/strings.xml index 62d55fa1337..17a6fcf125d 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -4019,6 +4019,12 @@ Battery level + + + Communal + + Communal settings + APNs diff --git a/res/xml/communal_settings.xml b/res/xml/communal_settings.xml new file mode 100644 index 00000000000..1a7938f855e --- /dev/null +++ b/res/xml/communal_settings.xml @@ -0,0 +1,20 @@ + + + + diff --git a/res/xml/top_level_settings.xml b/res/xml/top_level_settings.xml index 5fbc7350b89..8c82b671688 100644 --- a/res/xml/top_level_settings.xml +++ b/res/xml/top_level_settings.xml @@ -30,6 +30,16 @@ settings:highlightableMenuKey="@string/menu_key_network" settings:controller="com.android.settings.network.TopLevelNetworkEntryPreferenceController"/> + + (PARENT_TO_CATEGORY_KEY_MAP.size());