From 864b7f41bb398804ba22580e767eb309fe2bb7f2 Mon Sep 17 00:00:00 2001 From: Doris Ling Date: Fri, 3 Feb 2017 16:12:54 -0800 Subject: [PATCH] Remove category key SYSTEM_INPUT Since we are combining Language & regions and Input and gestures in System settings, we don't need 2 separate category keys. Bug: 34976047 Test: make RunSettingsLibRoboTests Change-Id: Ic11bfb5e4e373a3499772b1d4654187749197899 --- .../src/com/android/settingslib/drawer/CategoryKey.java | 1 - .../src/com/android/settingslib/drawer/CategoryKeyTest.java | 3 +-- 2 files changed, 1 insertion(+), 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 7e3f67b875e55..d6bde8132327f 100644 --- a/packages/SettingsLib/src/com/android/settingslib/drawer/CategoryKey.java +++ b/packages/SettingsLib/src/com/android/settingslib/drawer/CategoryKey.java @@ -36,7 +36,6 @@ 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 String CATEGORY_SYSTEM_DEVELOPMENT = 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 b209f4ec665a4..40353e7489b41 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,12 +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); allKeys.add(CategoryKey.CATEGORY_SYSTEM_DEVELOPMENT); // DO NOT REMOVE ANYTHING ABOVE - assertThat(allKeys.size()).isEqualTo(14); + assertThat(allKeys.size()).isEqualTo(13); } }