Merge "Merge "Notify ScreenOffController of battery saver change" into... (724bfeba) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -429,7 +429,6 @@ public class DozeParameters implements
		}

		dispatchAlwaysOnEvent();
		mScreenOffAnimationController.onAlwaysOnChanged(getAlwaysOn());
		}

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

		private boolean getPostureSpecificBool(

+4 −0

Original line number	Diff line number	Diff line
		@@ -180,6 +180,7 @@ public class DozeParametersTest extends SysuiTestCase {
		when(mAmbientDisplayConfiguration.alwaysOnEnabled(anyInt())).thenReturn(true);
		mDozeParameters.onTuningChanged(Settings.Secure.DOZE_ALWAYS_ON, "1");

		verify(mScreenOffAnimationController).onAlwaysOnChanged(false);
		assertThat(mDozeParameters.getAlwaysOn()).isFalse();
		}

		@@ -196,13 +197,16 @@ public class DozeParametersTest extends SysuiTestCase {
		mBatteryStateChangeCallback.getValue().onPowerSaveChanged(true);

		verify(callback, times(2)).onAlwaysOnChange();
		verify(mScreenOffAnimationController, times(2)).onAlwaysOnChanged(false);
		assertThat(mDozeParameters.getAlwaysOn()).isFalse();

		reset(mScreenOffAnimationController);
		reset(callback);
		when(mBatteryController.isAodPowerSave()).thenReturn(false);
		mBatteryStateChangeCallback.getValue().onPowerSaveChanged(true);

		verify(callback).onAlwaysOnChange();
		verify(mScreenOffAnimationController).onAlwaysOnChanged(true);
		assertThat(mDozeParameters.getAlwaysOn()).isTrue();
		}