From b76cd9709173febca6bc0020d3a391e55534015b Mon Sep 17 00:00:00 2001 From: Doris Ling Date: Fri, 11 May 2018 10:53:57 -0700 Subject: [PATCH] Rename settings category. - from night light to night display. Change-Id: Ib09e1b9299478dc4e8dcee935e29c6886d9dc7b8 Fixes: 79530682 Test: make RunSettingsLibRoboTests --- .../src/com/android/settingslib/drawer/CategoryKey.java | 4 ++-- .../src/com/android/settingslib/drawer/CategoryKeyTest.java | 2 +- 2 files changed, 3 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 6a2a04a76ed5b..dd8bfda43ff9b 100644 --- a/packages/SettingsLib/src/com/android/settingslib/drawer/CategoryKey.java +++ b/packages/SettingsLib/src/com/android/settingslib/drawer/CategoryKey.java @@ -49,8 +49,8 @@ public final class CategoryKey { "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_GESTURES = "com.android.settings.category.ia.gestures"; - public static final String CATEGORY_NIGHT_LIGHT = - "com.android.settings.category.ia.night_light"; + public static final String CATEGORY_NIGHT_DISPLAY = + "com.android.settings.category.ia.night_display"; 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 f34605caf0455..605c861fa07f4 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 @@ -58,7 +58,7 @@ public class CategoryKeyTest { allKeys.add(CategoryKey.CATEGORY_SYSTEM_LANGUAGE); allKeys.add(CategoryKey.CATEGORY_SYSTEM_DEVELOPMENT); allKeys.add(CategoryKey.CATEGORY_GESTURES); - allKeys.add(CategoryKey.CATEGORY_NIGHT_LIGHT); + allKeys.add(CategoryKey.CATEGORY_NIGHT_DISPLAY); // DO NOT REMOVE ANYTHING ABOVE assertThat(allKeys.size()).isEqualTo(18);