diff options
| author | Christine Franks <christyfranks@google.com> | 2019-01-24 12:18:40 -0800 |
|---|---|---|
| committer | Christine Franks <christyfranks@google.com> | 2019-01-24 12:18:40 -0800 |
| commit | a21c6edcf6261624b5ab1771d13f2a2ec6723f2b (patch) | |
| tree | 211b52f6327d975ad127e702546efab67c1ca514 /src/com/android/settings/display/NightDisplayPreferenceController.java | |
| parent | 17e119060637f1f2afcefab6c3d9d6d02ac29765 (diff) | |
| download | packages_apps_Settings-a21c6edcf6261624b5ab1771d13f2a2ec6723f2b.tar.gz packages_apps_Settings-a21c6edcf6261624b5ab1771d13f2a2ec6723f2b.tar.bz2 packages_apps_Settings-a21c6edcf6261624b5ab1771d13f2a2ec6723f2b.zip | |
Use ColorDisplayManager for night display settings
Bug: 123352608
Test: make ROBOTEST_FILTER="(Night*)" RunSettingsRoboTests -j48
Change-Id: Id4ab9ca4a21243be5967d63db72212daefb3dcb9
Diffstat (limited to 'src/com/android/settings/display/NightDisplayPreferenceController.java')
| -rw-r--r-- | src/com/android/settings/display/NightDisplayPreferenceController.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/com/android/settings/display/NightDisplayPreferenceController.java b/src/com/android/settings/display/NightDisplayPreferenceController.java index ab0250d50f..6891d65dd9 100644 --- a/src/com/android/settings/display/NightDisplayPreferenceController.java +++ b/src/com/android/settings/display/NightDisplayPreferenceController.java @@ -16,7 +16,6 @@ package com.android.settings.display; import android.content.Context; import android.hardware.display.ColorDisplayManager; -import com.android.internal.app.ColorDisplayController; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; @@ -37,8 +36,8 @@ public class NightDisplayPreferenceController extends AbstractPreferenceControll if (!isEnabled) { return true; } - final ColorDisplayController controller = new ColorDisplayController(context); - return controller.getAutoMode() != ColorDisplayManager.AUTO_MODE_DISABLED; + final ColorDisplayManager manager = context.getSystemService(ColorDisplayManager.class); + return manager.getNightDisplayAutoMode() != ColorDisplayManager.AUTO_MODE_DISABLED; } @Override |