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

Merge "Fix incorrect switch status when user stay in NightDisplaySettings page while scheduled night lights on" into main am: cdca93976a am: ca445ed06d

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2181238

Change-Id: I1175ad2c5dfeccf51fa8efc533d44e470ea7514a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2024-12-09 04:52:41 +00:00
committed by Automerger Merge Worker
parent 7ca56d493a ca445ed06d
commit d4ad552cd9
1 changed files with 0 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/android/settings/display/NightDisplayActivationPreferenceController.java
View File

@@ -90,11 +90,6 @@ public class NightDisplayActivationPreferenceController extends
} }
} }
@Override
public final void updateState(Preference preference) {
updateStateInternal();
}
/** FOR SLICES */ /** FOR SLICES */
@Override @Override
@@ -112,14 +107,4 @@ public class NightDisplayActivationPreferenceController extends
return mTimeFormatter.getAutoModeSummary(mContext, mColorDisplayManager); 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());
}
}
} }