PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use ColorDisplayManager for night display settings

Browse Source 
Bug: 123352608
Test: make ROBOTEST_FILTER="(Night*)" RunSettingsRoboTests -j48
Change-Id: Id4ab9ca4a21243be5967d63db72212daefb3dcb9
This commit is contained in:
Christine Franks
2019-01-24 12:18:40 -08:00
parent 17e1190606
commit a21c6edcf6
9 changed files with 55 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/display/NightDisplayPreferenceController.java
View File

@@ -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