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

Merge "Don't treat user switch as a brightness slider interaction" into tm-qpr-dev am: 25db0bee9c

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19430146

Change-Id: I9f6b9d589f3ad61ec4695124b5b662fd8420814d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Piotr Wilczyński
2022-08-11 15:20:10 +00:00
committed by Automerger Merge Worker
parent 0c110f7b78 25db0bee9c
commit 0e9395b4aa
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/display/DisplayPowerController.java
View File

@@ -1315,9 +1315,6 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
} }
final boolean autoBrightnessAdjustmentChanged = updateAutoBrightnessAdjustment(); final boolean autoBrightnessAdjustmentChanged = updateAutoBrightnessAdjustment();
if (autoBrightnessAdjustmentChanged) {
mTemporaryAutoBrightnessAdjustment = Float.NaN;
}
// Use the autobrightness adjustment override if set. // Use the autobrightness adjustment override if set.
final float autoBrightnessAdjustment; final float autoBrightnessAdjustment;
@@ -2293,14 +2290,15 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
private void handleSettingsChange(boolean userSwitch) { private void handleSettingsChange(boolean userSwitch) {
mPendingScreenBrightnessSetting = getScreenBrightnessSetting(); mPendingScreenBrightnessSetting = getScreenBrightnessSetting();
mPendingAutoBrightnessAdjustment = getAutoBrightnessAdjustmentSetting();
if (userSwitch) { if (userSwitch) {
// Don't treat user switches as user initiated change. // Don't treat user switches as user initiated change.
setCurrentScreenBrightness(mPendingScreenBrightnessSetting); setCurrentScreenBrightness(mPendingScreenBrightnessSetting);
updateAutoBrightnessAdjustment();
if (mAutomaticBrightnessController != null) { if (mAutomaticBrightnessController != null) {
mAutomaticBrightnessController.resetShortTermModel(); mAutomaticBrightnessController.resetShortTermModel();
} }
} }
mPendingAutoBrightnessAdjustment = getAutoBrightnessAdjustmentSetting();
// We don't bother with a pending variable for VR screen brightness since we just // We don't bother with a pending variable for VR screen brightness since we just
// immediately adapt to it. // immediately adapt to it.
mScreenBrightnessForVr = getScreenBrightnessForVrSetting(); mScreenBrightnessForVr = getScreenBrightnessForVrSetting();
@@ -2369,6 +2367,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
} }
mAutoBrightnessAdjustment = mPendingAutoBrightnessAdjustment; mAutoBrightnessAdjustment = mPendingAutoBrightnessAdjustment;
mPendingAutoBrightnessAdjustment = Float.NaN; mPendingAutoBrightnessAdjustment = Float.NaN;
mTemporaryAutoBrightnessAdjustment = Float.NaN;
return true; return true;
} }