From a226307b17fa95400a3f51ec02d6c354fb3c066b Mon Sep 17 00:00:00 2001 From: Christine Franks Date: Wed, 5 Dec 2018 15:35:42 -0800 Subject: [PATCH] Add display white balance setting Bug: 111215474 Test: make RunSettingsRoboTests -j100 Change-Id: Icf31ff820008740312ad811d0eda72fd3fb90a63 --- res/values/strings.xml | 3 + res/xml/display_settings.xml | 5 ++ ...splayWhiteBalancePreferenceController.java | 46 +++++++++++ ...yWhiteBalancePreferenceControllerTest.java | 78 +++++++++++++++++++ 4 files changed, 132 insertions(+) create mode 100644 src/com/android/settings/display/DisplayWhiteBalancePreferenceController.java create mode 100644 tests/robotests/src/com/android/settings/display/DisplayWhiteBalancePreferenceControllerTest.java diff --git a/res/values/strings.xml b/res/values/strings.xml index 126a8351795..56b7c66d2ce 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -2644,6 +2644,9 @@ Your screen brightness will automatically adjust to your environment and activities. You can move the slider manually to help adaptive brightness learn your preferences. + + Display white balance + Night Light diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml index 50a5649ac36..76b3d2eefba 100644 --- a/res/xml/display_settings.xml +++ b/res/xml/display_settings.xml @@ -79,6 +79,11 @@ settings:controller="com.android.settings.display.ColorModePreferenceController" settings:keywords="@string/keywords_color_mode" /> + +