Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add communal settings category key." into tm-qpr-dev am: 8118ea49ef am: ac7f50eb5b

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20737688

Change-Id: I4711acc9dc4b35811eb9cc324ca7efb98e40de41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Darrell Shi
2022-12-21 09:04:50 +00:00
committed by Automerger Merge Worker
parent c106493d76 ac7f50eb5b
commit 1c683fba4c
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SettingsLib/src/com/android/settingslib/drawer/CategoryKey.java
View File

@@ -66,6 +66,8 @@ public final class CategoryKey {
"com.android.settings.category.ia.battery_saver_settings";
public static final String CATEGORY_SMART_BATTERY_SETTINGS =
"com.android.settings.category.ia.smart_battery_settings";
public static final String CATEGORY_COMMUNAL_SETTINGS =
"com.android.settings.category.ia.communal";
public static final Map<String, String> KEY_COMPAT_MAP;

3
packages/SettingsLib/tests/robotests/src/com/android/settingslib/drawer/CategoryKeyTest.java
View File

@@ -60,8 +60,9 @@ public class CategoryKeyTest {
allKeys.add(CategoryKey.CATEGORY_GESTURES);
allKeys.add(CategoryKey.CATEGORY_NIGHT_DISPLAY);
allKeys.add(CategoryKey.CATEGORY_SMART_BATTERY_SETTINGS);
allKeys.add(CategoryKey.CATEGORY_COMMUNAL_SETTINGS);
// DO NOT REMOVE ANYTHING ABOVE
assertThat(allKeys.size()).isEqualTo(19);
assertThat(allKeys.size()).isEqualTo(20);
}
}