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

Commit 0d2fa1a9 authored by Justin Weir's avatar Justin Weir
Browse files

Delete NPVC.mIsLaunchTransitionFinished and associated dead code 

NPVC.mIsLaunchTransitionFinished is only ever set to false, so it
can be deleted along with any code gated by a true value. Also,
KeyguardViewController.shouldDisableWindowAnimationsForUnlock has
only one impl which passes on the value, so it and all code that
needs it to return true can be deleted as well.

Fixes: 256593504
Test: atest and manual
Change-Id: I696be4b8328b14ec7588f9d90d3fd6a4c8d85138
parent ad23a83c

packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java

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

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

+0 −6
Original line number Diff line number Diff line
@@ -2572,12 +2572,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;

            }

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

+2 −19
Original line number Diff line number Diff line
@@ -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() {
@@ -1309,7 +1292,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 


    @Override

    public boolean shouldDisableWindowAnimationsForUnlock() {

        return mNotificationPanelViewController.isLaunchTransitionFinished();

        return false;

    }



    @Override

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

+0 −12
Original line number Diff line number Diff line
@@ -305,17 +305,6 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase { 
        verify(mBouncer, never()).setExpansion(anyFloat());

    }



    @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);
@@ -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 */);