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

20
src/com/android/settings/display/NightDisplayTimeFormatter.java
View File

@@ -19,7 +19,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 java.text.DateFormat;
@@ -46,22 +45,23 @@ public class NightDisplayTimeFormatter {
return mTimeFormatter.format(c.getTime());
}
public String getAutoModeTimeSummary(Context context, ColorDisplayController controller) {
final int summaryFormatResId = controller.isActivated() ? R.string.night_display_summary_on
: R.string.night_display_summary_off;
return context.getString(summaryFormatResId, getAutoModeSummary(context, controller));
public String getAutoModeTimeSummary(Context context, ColorDisplayManager manager) {
final int summaryFormatResId =
manager.isNightDisplayActivated() ? R.string.night_display_summary_on
: R.string.night_display_summary_off;
return context.getString(summaryFormatResId, getAutoModeSummary(context, manager));
}
private String getAutoModeSummary(Context context, ColorDisplayController controller) {
final boolean isActivated = controller.isActivated();
final int autoMode = controller.getAutoMode();
private String getAutoModeSummary(Context context, ColorDisplayManager manager) {
final boolean isActivated = manager.isNightDisplayActivated();
final int autoMode = manager.getNightDisplayAutoMode();
if (autoMode == ColorDisplayManager.AUTO_MODE_CUSTOM_TIME) {
if (isActivated) {
return context.getString(R.string.night_display_summary_on_auto_mode_custom,
getFormattedTimeString(controller.getCustomEndTime()));
getFormattedTimeString(manager.getNightDisplayCustomEndTime()));
} else {
return context.getString(R.string.night_display_summary_off_auto_mode_custom,
getFormattedTimeString(controller.getCustomStartTime()));
getFormattedTimeString(manager.getNightDisplayCustomStartTime()));
}
} else if (autoMode == ColorDisplayManager.AUTO_MODE_TWILIGHT) {
return context.getString(isActivated