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

Commit d001478a authored by Peter Kalauskas's avatar Peter Kalauskas Committed by Automerger Merge Worker
Browse files

Merge "Only delay wake-up animation if AOD is enabled" into udc-dev am: 7a6b4852 

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



Change-Id: I8d9ae9d9e006ba955cf325d36eb0835ec1805d49
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ad8be166 7a6b4852

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

+13 −4
Original line number Diff line number Diff line
@@ -475,6 +475,13 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { 
     */

    private boolean mShouldDelayWakeUpAnimation = false;



    /**

     * Whether we should delay the AOD->Lockscreen animation.

     * If false, the animation will start in onStartedWakingUp().

     * If true, the animation will start in onFinishedWakingUp().

     */

    private boolean mShouldDelayLockscreenTransitionFromAod = false;



    private final Object mQueueLock = new Object();



    private final PulseExpansionHandler mPulseExpansionHandler;
@@ -3242,7 +3249,10 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { 


                updateVisibleToUser();

                updateIsKeyguard();

                if (!mFeatureFlags.isEnabled(Flags.ZJ_285570694_LOCKSCREEN_TRANSITION_FROM_AOD)) {

                mShouldDelayLockscreenTransitionFromAod = mDozeParameters.getAlwaysOn()

                        && mFeatureFlags.isEnabled(

                                Flags.ZJ_285570694_LOCKSCREEN_TRANSITION_FROM_AOD);

                if (!mShouldDelayLockscreenTransitionFromAod) {

                    startLockscreenTransitionFromAod();

                }

            });
@@ -3251,8 +3261,7 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { 


        /**

         * Private helper for starting the LOCKSCREEN_TRANSITION_FROM_AOD animation - only necessary

         * so we can start it from either onFinishedWakingUp() or onFinishedWakingUp() depending

         * on a flag value.

         * so we can start it from either onFinishedWakingUp() or onFinishedWakingUp().

         */

        private void startLockscreenTransitionFromAod() {

            // stopDozing() starts the LOCKSCREEN_TRANSITION_FROM_AOD animation.
@@ -3273,7 +3282,7 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { 


        @Override

        public void onFinishedWakingUp() {

            if (mFeatureFlags.isEnabled(Flags.ZJ_285570694_LOCKSCREEN_TRANSITION_FROM_AOD)) {

            if (mShouldDelayLockscreenTransitionFromAod) {

                mNotificationShadeWindowController.batchApplyWindowLayoutParams(

                        this::startLockscreenTransitionFromAod);

            }

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

+2 −0
Original line number Diff line number Diff line
@@ -350,7 +350,9 @@ public class CentralSurfacesImplTest extends SysuiTestCase { 
        // For the Shade to animate during the Back gesture, we must enable the animation flag.

        mFeatureFlags.set(Flags.WM_SHADE_ANIMATE_BACK_GESTURE, true);

        mFeatureFlags.set(Flags.LIGHT_REVEAL_MIGRATION, true);

        // Turn AOD on and toggle feature flag for jank fixes

        mFeatureFlags.set(Flags.ZJ_285570694_LOCKSCREEN_TRANSITION_FROM_AOD, true);

        when(mDozeParameters.getAlwaysOn()).thenReturn(true);



        IThermalService thermalService = mock(IThermalService.class);

        mPowerManager = new PowerManager(mContext, mPowerManagerService, thermalService,