From 9c9e364ae85c7386df7e46e5bb1e8bcdde7a889c Mon Sep 17 00:00:00 2001 From: Fan Zhang Date: Fri, 4 Nov 2016 12:53:46 -0700 Subject: [PATCH] Add new category for input setting and language setting Bug: 32637613 Bug: 32643833 Test: RunSettingsLibRoboTests Change-Id: I3551f3743982372e314dac1c778d0faddbfbea69 --- .../src/com/android/settingslib/drawer/CategoryKey.java | 3 +++ .../src/com/android/settingslib/drawer/CategoryKeyTest.java | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/SettingsLib/src/com/android/settingslib/drawer/CategoryKey.java b/packages/SettingsLib/src/com/android/settingslib/drawer/CategoryKey.java index b27aad94b0c1a..e07856e467794 100644 --- a/packages/SettingsLib/src/com/android/settingslib/drawer/CategoryKey.java +++ b/packages/SettingsLib/src/com/android/settingslib/drawer/CategoryKey.java @@ -36,6 +36,9 @@ public final class CategoryKey { public static final String CATEGORY_SECURITY = "com.android.settings.category.ia.security"; public static final String CATEGORY_ACCOUNT = "com.android.settings.category.ia.accounts"; public static final String CATEGORY_SYSTEM = "com.android.settings.category.ia.system"; + public static final String CATEGORY_SYSTEM_INPUT = "com.android.settings.category.ia.input"; + public static final String CATEGORY_SYSTEM_LANGUAGE = + "com.android.settings.category.ia.language"; 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 f93c56607cedb..a0254cd949232 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 @@ -56,9 +56,11 @@ public class CategoryKeyTest { allKeys.add(CategoryKey.CATEGORY_SECURITY); allKeys.add(CategoryKey.CATEGORY_ACCOUNT); allKeys.add(CategoryKey.CATEGORY_SYSTEM); + allKeys.add(CategoryKey.CATEGORY_SYSTEM_INPUT); + allKeys.add(CategoryKey.CATEGORY_SYSTEM_LANGUAGE); // DO NOT REMOVE ANYTHING ABOVE - assertThat(allKeys.size()).isEqualTo(11); + assertThat(allKeys.size()).isEqualTo(13); } }