Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9c81ccc2 authored by Matt Pietal's avatar Matt Pietal Committed by Automerger Merge Worker
Browse files

Merge "Notify ScreenOffController of battery saver change" into tm-qpr-dev am: db72e4fa 

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



Change-Id: If554550c59c403bd595e57a9af77713fd67324e0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b14b8f1e db72e4fa

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -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(

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

+4 −0
Original line number Original line Diff line number Diff line
@@ -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();

    }

    }