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

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

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

Change-Id: I78f921677d1f9dc0f0db4417c85fc9b04ed239cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Peter Kalauskas
2023-06-15 23:46:31 +00:00
committed by Automerger Merge Worker
parent b8a75f4640 7a6b4852bb
commit ba7950a54b
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -475,6 +475,13 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces {
*/ */
private boolean mShouldDelayWakeUpAnimation = false; 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 Object mQueueLock = new Object();
private final PulseExpansionHandler mPulseExpansionHandler; private final PulseExpansionHandler mPulseExpansionHandler;
@@ -3242,7 +3249,10 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces {
updateVisibleToUser(); updateVisibleToUser();
updateIsKeyguard(); 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(); startLockscreenTransitionFromAod();
} }
}); });
@@ -3251,8 +3261,7 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces {
/** /**
* Private helper for starting the LOCKSCREEN_TRANSITION_FROM_AOD animation - only necessary * Private helper for starting the LOCKSCREEN_TRANSITION_FROM_AOD animation - only necessary
* so we can start it from either onFinishedWakingUp() or onFinishedWakingUp() depending * so we can start it from either onFinishedWakingUp() or onFinishedWakingUp().
* on a flag value.
*/ */
private void startLockscreenTransitionFromAod() { private void startLockscreenTransitionFromAod() {
// stopDozing() starts the LOCKSCREEN_TRANSITION_FROM_AOD animation. // stopDozing() starts the LOCKSCREEN_TRANSITION_FROM_AOD animation.
@@ -3273,7 +3282,7 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces {
@Override @Override
public void onFinishedWakingUp() { public void onFinishedWakingUp() {
if (mFeatureFlags.isEnabled(Flags.ZJ_285570694_LOCKSCREEN_TRANSITION_FROM_AOD)) { if (mShouldDelayLockscreenTransitionFromAod) {
mNotificationShadeWindowController.batchApplyWindowLayoutParams( mNotificationShadeWindowController.batchApplyWindowLayoutParams(
this::startLockscreenTransitionFromAod); this::startLockscreenTransitionFromAod);
} }

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

@@ -350,7 +350,9 @@ public class CentralSurfacesImplTest extends SysuiTestCase {
// For the Shade to animate during the Back gesture, we must enable the animation flag. // 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.WM_SHADE_ANIMATE_BACK_GESTURE, true);
mFeatureFlags.set(Flags.LIGHT_REVEAL_MIGRATION, 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); mFeatureFlags.set(Flags.ZJ_285570694_LOCKSCREEN_TRANSITION_FROM_AOD, true);
when(mDozeParameters.getAlwaysOn()).thenReturn(true);
IThermalService thermalService = mock(IThermalService.class); IThermalService thermalService = mock(IThermalService.class);
mPowerManager = new PowerManager(mContext, mPowerManagerService, thermalService, mPowerManager = new PowerManager(mContext, mPowerManagerService, thermalService,