From b715d6b6757b3b37adf2e7689b3acdeffc4c68bd Mon Sep 17 00:00:00 2001 From: Doris Ling Date: Fri, 11 May 2018 10:59:58 -0700 Subject: [PATCH] Rename settings category. - from night light to night display. Change-Id: I2d6c8d931793439dc3b028b4b7a46c21444e10a0 Fixes: 79530682 Test: make RunSettingsRoboTests --- .../android/settings/dashboard/DashboardFragmentRegistry.java | 2 +- .../android/settings/display/NightDisplaySettingsTest.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/com/android/settings/dashboard/DashboardFragmentRegistry.java b/src/com/android/settings/dashboard/DashboardFragmentRegistry.java index 5e45c43dfbb..cd478fc43ad 100644 --- a/src/com/android/settings/dashboard/DashboardFragmentRegistry.java +++ b/src/com/android/settings/dashboard/DashboardFragmentRegistry.java @@ -100,7 +100,7 @@ public class DashboardFragmentRegistry { PARENT_TO_CATEGORY_KEY_MAP.put(GestureSettings.class.getName(), CategoryKey.CATEGORY_GESTURES); PARENT_TO_CATEGORY_KEY_MAP.put(NightDisplaySettings.class.getName(), - CategoryKey.CATEGORY_NIGHT_LIGHT); + CategoryKey.CATEGORY_NIGHT_DISPLAY); CATEGORY_KEY_TO_PARENT_MAP = new ArrayMap<>(PARENT_TO_CATEGORY_KEY_MAP.size()); diff --git a/tests/robotests/src/com/android/settings/display/NightDisplaySettingsTest.java b/tests/robotests/src/com/android/settings/display/NightDisplaySettingsTest.java index e3f90929d2d..6942fd84d6c 100644 --- a/tests/robotests/src/com/android/settings/display/NightDisplaySettingsTest.java +++ b/tests/robotests/src/com/android/settings/display/NightDisplaySettingsTest.java @@ -48,8 +48,8 @@ public class NightDisplaySettingsTest { } @Test - public void getCategoryKey_isCategoryNightLight() { + public void getCategoryKey_isCategoryNightDisplay() { NightDisplaySettings settings = new NightDisplaySettings(); - assertThat(settings.getCategoryKey()).isEqualTo(CategoryKey.CATEGORY_NIGHT_LIGHT); + assertThat(settings.getCategoryKey()).isEqualTo(CategoryKey.CATEGORY_NIGHT_DISPLAY); } }