diff options
| author | Katsiaryna Naliuka <katsiaryna@google.com> | 2017-06-13 22:23:23 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-06-13 22:23:23 +0000 |
| commit | 0dfadbef78b98bfdfe0aa59308a6d14a1549f488 (patch) | |
| tree | 4b56309f2553d57db1db85cb88920ed985ff27f9 | |
| parent | 71f940f652c21d0208fdf5a342580e98f74220ed (diff) | |
| parent | 7cb007c6d37c7990ee714503d0f17ce3c56a7c4e (diff) | |
Merge "Added a category for lockscreen settings." into oc-dr1-dev
am: 7cb007c6d3
Change-Id: Ifd60b2b309fe7e251c13844ef5473bad1a73c757
| -rw-r--r-- | packages/SettingsLib/src/com/android/settingslib/drawer/CategoryKey.java | 2 | ||||
| -rw-r--r-- | packages/SettingsLib/tests/robotests/src/com/android/settingslib/drawer/CategoryKeyTest.java | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/packages/SettingsLib/src/com/android/settingslib/drawer/CategoryKey.java b/packages/SettingsLib/src/com/android/settingslib/drawer/CategoryKey.java index 9d09737a14dc..e067de1a5e7a 100644 --- a/packages/SettingsLib/src/com/android/settingslib/drawer/CategoryKey.java +++ b/packages/SettingsLib/src/com/android/settingslib/drawer/CategoryKey.java @@ -34,6 +34,8 @@ public final class CategoryKey { public static final String CATEGORY_SOUND = "com.android.settings.category.ia.sound"; public static final String CATEGORY_STORAGE = "com.android.settings.category.ia.storage"; public static final String CATEGORY_SECURITY = "com.android.settings.category.ia.security"; + public static final String CATEGORY_SECURITY_LOCKSCREEN = + "com.android.settings.category.ia.lockscreen"; 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_LANGUAGE = 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 40353e7489b4..9fc8a9607cba 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 @@ -54,13 +54,14 @@ public class CategoryKeyTest { allKeys.add(CategoryKey.CATEGORY_SOUND); allKeys.add(CategoryKey.CATEGORY_STORAGE); allKeys.add(CategoryKey.CATEGORY_SECURITY); + allKeys.add(CategoryKey.CATEGORY_SECURITY_LOCKSCREEN); allKeys.add(CategoryKey.CATEGORY_ACCOUNT); allKeys.add(CategoryKey.CATEGORY_SYSTEM); allKeys.add(CategoryKey.CATEGORY_SYSTEM_LANGUAGE); allKeys.add(CategoryKey.CATEGORY_SYSTEM_DEVELOPMENT); // DO NOT REMOVE ANYTHING ABOVE - assertThat(allKeys.size()).isEqualTo(13); + assertThat(allKeys.size()).isEqualTo(14); } } |