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

Remove category key SYSTEM_INPUT

Browse Source 
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
This commit is contained in:
Doris Ling
2017-02-03 16:12:54 -08:00
parent b475e009a0
commit 864b7f41bb
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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 =

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

@@ -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);
}
}