From 245992c88088daef16dc55043788768bbbebe277 Mon Sep 17 00:00:00 2001 From: Doris Ling Date: Thu, 10 May 2018 13:29:38 -0700 Subject: [PATCH] Add new category keys. Adding 2 new category keys for injecting dynamic tiles: - night light - gestures Bug: 79530682 Bug: 79532703 Test: make RunSettingsLibRoboTests Change-Id: I4e7f10c8abdf425f24d5b51bcc8a5f80faca5281 --- .../src/com/android/settingslib/drawer/CategoryKey.java | 6 ++++-- .../src/com/android/settingslib/drawer/CategoryKeyTest.java | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/packages/SettingsLib/src/com/android/settingslib/drawer/CategoryKey.java b/packages/SettingsLib/src/com/android/settingslib/drawer/CategoryKey.java index 54a1af4da1ca6..6a2a04a76ed5b 100644 --- a/packages/SettingsLib/src/com/android/settingslib/drawer/CategoryKey.java +++ b/packages/SettingsLib/src/com/android/settingslib/drawer/CategoryKey.java @@ -47,8 +47,10 @@ public final class CategoryKey { "com.android.settings.category.ia.development"; public static final String CATEGORY_NOTIFICATIONS = "com.android.settings.category.ia.notifications"; - public static final String CATEGORY_DO_NOT_DISTURB = - "com.android.settings.category.ia.dnd"; + public static final String CATEGORY_DO_NOT_DISTURB = "com.android.settings.category.ia.dnd"; + public static final String CATEGORY_GESTURES = "com.android.settings.category.ia.gestures"; + public static final String CATEGORY_NIGHT_LIGHT = + "com.android.settings.category.ia.night_light"; public static final Map KEY_COMPAT_MAP; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/drawer/CategoryKeyTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/drawer/CategoryKeyTest.java index d12473e23ef9a..f34605caf0455 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/drawer/CategoryKeyTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/drawer/CategoryKeyTest.java @@ -57,8 +57,10 @@ public class CategoryKeyTest { allKeys.add(CategoryKey.CATEGORY_SYSTEM); allKeys.add(CategoryKey.CATEGORY_SYSTEM_LANGUAGE); allKeys.add(CategoryKey.CATEGORY_SYSTEM_DEVELOPMENT); + allKeys.add(CategoryKey.CATEGORY_GESTURES); + allKeys.add(CategoryKey.CATEGORY_NIGHT_LIGHT); // DO NOT REMOVE ANYTHING ABOVE - assertThat(allKeys.size()).isEqualTo(16); + assertThat(allKeys.size()).isEqualTo(18); } }