diff options
4 files changed, 2 insertions, 43 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java index 3a624ca7b6ab..59b1ed7eadaa 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java +++ b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java @@ -455,7 +455,6 @@ public final class NotificationPanelViewController { * need to take this into account in our panel height calculation. */ private boolean mQsAnimatorExpand; - private boolean mIsLaunchTransitionFinished; private ValueAnimator mQsSizeChangeAnimator; private boolean mQsScrimEnabled = true; private boolean mQsTouchAboveFalsingThreshold; @@ -1753,7 +1752,6 @@ public final class NotificationPanelViewController { } public void resetViews(boolean animate) { - mIsLaunchTransitionFinished = false; mCentralSurfaces.getGutsManager().closeAndSaveGuts(true /* leavebehind */, true /* force */, true /* controls */, -1 /* x */, -1 /* y */, true /* resetMenu */); if (animate && !isFullyCollapsed()) { @@ -3779,10 +3777,6 @@ public final class NotificationPanelViewController { mQs.closeCustomizer(); } - public boolean isLaunchTransitionFinished() { - return mIsLaunchTransitionFinished; - } - public void setIsLaunchAnimationRunning(boolean running) { boolean wasRunning = mIsLaunchAnimationRunning; mIsLaunchAnimationRunning = running; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java index 6bb5272fe274..6f952f509494 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java @@ -2549,12 +2549,6 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { // ordering. mMainExecutor.execute(mShadeController::runPostCollapseRunnables); } - } else if (mNotificationPanelViewController.isLaunchTransitionFinished()) { - // We are not dismissing the shade, but the launch transition is already - // finished, - // so nobody will call readyForKeyguardDone anymore. Post it such that - // keyguardDonePending gets called first. - mMainExecutor.execute(mStatusBarKeyguardViewManager::readyForKeyguardDone); } return deferred; } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java index 93b6437822bd..21b876256958 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java @@ -476,7 +476,6 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb } else if (mKeyguardStateController.isShowing() && !hideBouncerOverDream) { if (!isWakeAndUnlocking() && !(mBiometricUnlockController.getMode() == MODE_DISMISS_BOUNCER) - && !mNotificationPanelViewController.isLaunchTransitionFinished() && !isUnlockCollapsing()) { if (mBouncer != null) { mBouncer.setExpansion(fraction); @@ -845,21 +844,6 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb if (isShowing && isOccluding) { SysUiStatsLog.write(SysUiStatsLog.KEYGUARD_STATE_CHANGED, SysUiStatsLog.KEYGUARD_STATE_CHANGED__STATE__OCCLUDED); - if (mNotificationPanelViewController.isLaunchTransitionFinished()) { - final Runnable endRunnable = new Runnable() { - @Override - public void run() { - mNotificationShadeWindowController.setKeyguardOccluded(isOccluded); - reset(true /* hideBouncerWhenShowing */); - } - }; - mCentralSurfaces.fadeKeyguardAfterLaunchTransition( - null /* beforeFading */, - endRunnable, - endRunnable); - return; - } - if (mCentralSurfaces.isLaunchingActivityOverLockscreen()) { // When isLaunchingActivityOverLockscreen() is true, we know for sure that the post // collapse runnables will be run. @@ -931,8 +915,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb long uptimeMillis = SystemClock.uptimeMillis(); long delay = Math.max(0, startTime + HIDE_TIMING_CORRECTION_MS - uptimeMillis); - if (mNotificationPanelViewController.isLaunchTransitionFinished() - || mKeyguardStateController.isFlingingToDismissKeyguard()) { + if (mKeyguardStateController.isFlingingToDismissKeyguard()) { final boolean wasFlingingToDismissKeyguard = mKeyguardStateController.isFlingingToDismissKeyguard(); mCentralSurfaces.fadeKeyguardAfterLaunchTransition(new Runnable() { @@ -1308,7 +1291,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb @Override public boolean shouldDisableWindowAnimationsForUnlock() { - return mNotificationPanelViewController.isLaunchTransitionFinished(); + return false; } @Override diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManagerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManagerTest.java index 716666657871..ec8d71136452 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManagerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManagerTest.java @@ -306,17 +306,6 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase { } @Test - public void onPanelExpansionChanged_neverTranslatesBouncerWhenLaunchingApp() { - when(mNotificationPanelView.isLaunchTransitionFinished()).thenReturn(true); - mStatusBarKeyguardViewManager.onPanelExpansionChanged( - expansionEvent( - /* fraction= */ KeyguardBouncer.EXPANSION_VISIBLE, - /* expanded= */ true, - /* tracking= */ false)); - verify(mBouncer, never()).setExpansion(anyFloat()); - } - - @Test public void onPanelExpansionChanged_neverTranslatesBouncerWhenShadeLocked() { when(mStatusBarStateController.getState()).thenReturn(StatusBarState.SHADE_LOCKED); mStatusBarKeyguardViewManager.onPanelExpansionChanged( @@ -361,7 +350,6 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase { @Test public void setOccluded_isInLaunchTransition_onKeyguardOccludedChangedCalled() { - when(mNotificationPanelView.isLaunchTransitionFinished()).thenReturn(true); mStatusBarKeyguardViewManager.show(null); mStatusBarKeyguardViewManager.setOccluded(true /* occluded */, false /* animated */); |