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

Merge "Notify ScreenOffController of battery saver change" into tm-qpr-dev am: db72e4fab4 am: 9c81ccc2f0

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

Change-Id: I641466a3da53423c3f2871005218ba526cc9516d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Matt Pietal
2023-03-07 01:54:48 +00:00
committed by Automerger Merge Worker
parent e1faab7c16 9c81ccc2f0
commit bd6d376738
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeParameters.java
View File

@@ -429,7 +429,6 @@ public class DozeParameters implements
} }
dispatchAlwaysOnEvent(); dispatchAlwaysOnEvent();
mScreenOffAnimationController.onAlwaysOnChanged(getAlwaysOn());
} }
@Override @Override
@@ -469,6 +468,7 @@ public class DozeParameters implements
for (Callback callback : mCallbacks) { for (Callback callback : mCallbacks) {
callback.onAlwaysOnChange(); callback.onAlwaysOnChange();
} }
mScreenOffAnimationController.onAlwaysOnChanged(getAlwaysOn());
} }
private boolean getPostureSpecificBool( private boolean getPostureSpecificBool(

4
packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/DozeParametersTest.java
View File

@@ -180,6 +180,7 @@ public class DozeParametersTest extends SysuiTestCase {
when(mAmbientDisplayConfiguration.alwaysOnEnabled(anyInt())).thenReturn(true); when(mAmbientDisplayConfiguration.alwaysOnEnabled(anyInt())).thenReturn(true);
mDozeParameters.onTuningChanged(Settings.Secure.DOZE_ALWAYS_ON, "1"); mDozeParameters.onTuningChanged(Settings.Secure.DOZE_ALWAYS_ON, "1");
verify(mScreenOffAnimationController).onAlwaysOnChanged(false);
assertThat(mDozeParameters.getAlwaysOn()).isFalse(); assertThat(mDozeParameters.getAlwaysOn()).isFalse();
} }
@@ -196,13 +197,16 @@ public class DozeParametersTest extends SysuiTestCase {
mBatteryStateChangeCallback.getValue().onPowerSaveChanged(true); mBatteryStateChangeCallback.getValue().onPowerSaveChanged(true);
verify(callback, times(2)).onAlwaysOnChange(); verify(callback, times(2)).onAlwaysOnChange();
verify(mScreenOffAnimationController, times(2)).onAlwaysOnChanged(false);
assertThat(mDozeParameters.getAlwaysOn()).isFalse(); assertThat(mDozeParameters.getAlwaysOn()).isFalse();
reset(mScreenOffAnimationController);
reset(callback); reset(callback);
when(mBatteryController.isAodPowerSave()).thenReturn(false); when(mBatteryController.isAodPowerSave()).thenReturn(false);
mBatteryStateChangeCallback.getValue().onPowerSaveChanged(true); mBatteryStateChangeCallback.getValue().onPowerSaveChanged(true);
verify(callback).onAlwaysOnChange(); verify(callback).onAlwaysOnChange();
verify(mScreenOffAnimationController).onAlwaysOnChanged(true);
assertThat(mDozeParameters.getAlwaysOn()).isTrue(); assertThat(mDozeParameters.getAlwaysOn()).isTrue();
} }