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: Id7f00d7beec737ac9872b85df251ce6e1f76cd55
This commit is contained in:
Christine Franks
2019-01-24 12:18:40 -08:00
parent 4c49ae1f7f
commit 0fd4d8ec92
3 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/display/NightDisplaySettings.java
View File

@@ -21,12 +21,12 @@ import android.app.TimePickerDialog;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.hardware.display.ColorDisplayManager;
import android.hardware.display.NightDisplayListener;
import android.os.Bundle;
import android.provider.SearchIndexableResource;
import androidx.preference.Preference;
import com.android.internal.app.ColorDisplayController;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
@@ -43,7 +43,7 @@ import java.util.List;
*/
@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
public class NightDisplaySettings extends DashboardFragment
implements ColorDisplayController.Callback {
implements NightDisplayListener.Callback {
private static final String TAG = "NightDisplaySettings";
@@ -51,7 +51,7 @@ public class NightDisplaySettings extends DashboardFragment
private static final int DIALOG_END_TIME = 1;
private ColorDisplayManager mColorDisplayManager;
private ColorDisplayController mController;
private NightDisplayListener mNightDisplayListener;
@Override
public void onCreate(Bundle savedInstanceState) {
@@ -59,7 +59,7 @@ public class NightDisplaySettings extends DashboardFragment
final Context context = getContext();
mColorDisplayManager = context.getSystemService(ColorDisplayManager.class);
mController = new ColorDisplayController(context);
mNightDisplayListener = new NightDisplayListener(context);
}
@Override
@@ -67,7 +67,7 @@ public class NightDisplaySettings extends DashboardFragment
super.onStart();
// Listen for changes only while visible.
mController.setListener(this);
mNightDisplayListener.setCallback(this);
}
@Override
@@ -75,7 +75,7 @@ public class NightDisplaySettings extends DashboardFragment
super.onStop();
// Stop listening for state changes.
mController.setListener(null);
mNightDisplayListener.setCallback(null);
}
@Override