Merge "Fix incorrect switch status when user stay in NightDisplaySettings page while scheduled night lights on" into main am: cdca93976a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2181238 Change-Id: I8c3f7ba8b5a1e237148a6532d53d2b519ef1862f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -90,11 +90,6 @@ public class NightDisplayActivationPreferenceController extends
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public final void updateState(Preference preference) {
|
||||
updateStateInternal();
|
||||
}
|
||||
|
||||
/** FOR SLICES */
|
||||
|
||||
@Override
|
||||
@@ -112,14 +107,4 @@ public class NightDisplayActivationPreferenceController extends
|
||||
return mTimeFormatter.getAutoModeSummary(mContext, mColorDisplayManager);
|
||||
}
|
||||
|
||||
private void updateStateInternal() {
|
||||
final boolean isActivated = mColorDisplayManager.isNightDisplayActivated();
|
||||
final int autoMode = mColorDisplayManager.getNightDisplayAutoMode();
|
||||
|
||||
if (autoMode == ColorDisplayManager.AUTO_MODE_CUSTOM_TIME) {
|
||||
mTimeFormatter.getFormattedTimeString(isActivated
|
||||
? mColorDisplayManager.getNightDisplayCustomStartTime()
|
||||
: mColorDisplayManager.getNightDisplayCustomEndTime());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user