Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Dark theme upgrade broken" into rvc-dev am: e95887d548

Browse Source 
Change-Id: I123591fa17b342d587a818ffd02238dcaf60498f
This commit is contained in:
Automerger Merge Worker
2020-03-06 15:49:42 +00:00
parent d4b46970a9 e95887d548
commit 4a630712c7
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/UiModeManagerService.java
View File

@@ -467,9 +467,9 @@ final class UiModeManagerService extends SystemService {
mNightMode = Secure.getIntForUser(context.getContentResolver(), mNightMode = Secure.getIntForUser(context.getContentResolver(),
Secure.UI_NIGHT_MODE, defaultNightMode, userId); Secure.UI_NIGHT_MODE, defaultNightMode, userId);
mOverrideNightModeOn = Secure.getIntForUser(context.getContentResolver(), mOverrideNightModeOn = Secure.getIntForUser(context.getContentResolver(),
Secure.UI_NIGHT_MODE_OVERRIDE_ON, defaultNightMode, userId) != 0; Secure.UI_NIGHT_MODE_OVERRIDE_ON, 0, userId) != 0;
mOverrideNightModeOff = Secure.getIntForUser(context.getContentResolver(), mOverrideNightModeOff = Secure.getIntForUser(context.getContentResolver(),
Secure.UI_NIGHT_MODE_OVERRIDE_OFF, defaultNightMode, userId) != 0; Secure.UI_NIGHT_MODE_OVERRIDE_OFF, 0, userId) != 0;
mCustomAutoNightModeStartMilliseconds = LocalTime.ofNanoOfDay( mCustomAutoNightModeStartMilliseconds = LocalTime.ofNanoOfDay(
Secure.getLongForUser(context.getContentResolver(), Secure.getLongForUser(context.getContentResolver(),
Secure.DARK_THEME_CUSTOM_START_TIME, Secure.DARK_THEME_CUSTOM_START_TIME,
@@ -1045,7 +1045,6 @@ final class UiModeManagerService extends SystemService {
final TwilightState lastState = mTwilightManager.getLastTwilightState(); final TwilightState lastState = mTwilightManager.getLastTwilightState();
activateNightMode = lastState == null ? mComputedNightMode : lastState.isNight(); activateNightMode = lastState == null ? mComputedNightMode : lastState.isNight();
} }
updateComputedNightModeLocked(activateNightMode); updateComputedNightModeLocked(activateNightMode);
} else { } else {
if (mTwilightManager != null) { if (mTwilightManager != null) {
@@ -1375,6 +1374,9 @@ final class UiModeManagerService extends SystemService {
private void updateComputedNightModeLocked(boolean activate) { private void updateComputedNightModeLocked(boolean activate) {
mComputedNightMode = activate; mComputedNightMode = activate;
if (mNightMode == MODE_NIGHT_YES || mNightMode == UiModeManager.MODE_NIGHT_NO) {
return;
}
if (mOverrideNightModeOn && !mComputedNightMode) { if (mOverrideNightModeOn && !mComputedNightMode) {
mComputedNightMode = true; mComputedNightMode = true;
return; return;