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

Commit 1f6fb398 authored by Bryce Lee's avatar Bryce Lee
Browse files

Revert "Do not allow panel expansion with bouncer over dream." 

This reverts commit 5cb83b89.

Reason for revert: Causes issues with transition animations

Test: manual
Change-Id: I82c6d3a6f78622fad37352d0f01ab1fbc8023185
parent b1dc2717

packages/SystemUI/src/com/android/systemui/dreams/touch/BouncerSwipeTouchHandler.java

+0 −3
Original line number Diff line number Diff line
@@ -144,9 +144,6 @@ public class BouncerSwipeTouchHandler implements DreamTouchHandler { 


    private void setPanelExpansion(float expansion) {

        mCurrentExpansion = expansion;



        mCentralSurfaces.setBouncerShowing(expansion != KeyguardBouncer.EXPANSION_HIDDEN);



        mStatusBarKeyguardViewManager.onPanelExpansionChanged(mCurrentExpansion, false, true);

    }

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

+5 −6
Original line number Diff line number Diff line
@@ -3467,7 +3467,9 @@ public class CentralSurfaces extends CoreStartable implements 
        mStatusBarHideIconsForBouncerManager.setBouncerShowingAndTriggerUpdate(bouncerShowing);

        mCommandQueue.recomputeDisableFlags(mDisplayId, true /* animate */);

        updateScrimController();

        updateNotificationPanelTouchState();

        if (!mBouncerShowing) {

            updatePanelExpansionForKeyguard();

        }

    }



    /**
@@ -3612,13 +3614,10 @@ public class CentralSurfaces extends CoreStartable implements 
     * collapse the panel after we expanded it, and thus we would end up with a blank

     * Keyguard.

     */

    public void updateNotificationPanelTouchState() {

    void updateNotificationPanelTouchState() {

        boolean goingToSleepWithoutAnimation = isGoingToSleep()

                && !mDozeParameters.shouldControlScreenOff();

        boolean bouncerShowingOverDream = isBouncerShowing()

                && mDreamOverlayStateController.isOverlayActive();

        boolean disabled = bouncerShowingOverDream

                || (!mDeviceInteractive && !mDozeServiceHost.isPulsing())

        boolean disabled = (!mDeviceInteractive && !mDozeServiceHost.isPulsing())

                || goingToSleepWithoutAnimation;

        mNotificationPanelViewController.setTouchAndAnimationDisabled(disabled);

        mNotificationIconAreaController.setAnimationsEnabled(!disabled);

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

+0 −2
Original line number Diff line number Diff line
@@ -418,8 +418,6 @@ public abstract class PanelViewController { 
                    expand = false;

                } else if (onKeyguard) {

                    expand = true;

                } else if (mCentralSurfaces.isBouncerShowingOverDream()) {

                    expand = false;

                } else if (mKeyguardStateController.isKeyguardFadingAway()) {

                    // If we're in the middle of dismissing the keyguard, don't expand due to the

                    // cancelled gesture. Gesture cancellation during an unlock is expected in some

packages/SystemUI/tests/src/com/android/systemui/dreams/touch/BouncerSwipeTouchHandlerTest.java

+0 −23
Original line number Diff line number Diff line
@@ -160,28 +160,6 @@ public class BouncerSwipeTouchHandlerTest extends SysuiTestCase { 
                        2)).isTrue();

    }



    /**

     * Ensures {@link CentralSurfaces}

     */

    @Test

    public void testInformBouncerShowingOnExpand() {

        swipeToPosition(1f, Direction.UP, 0);

        verify(mCentralSurfaces).setBouncerShowing(true);

    }



    /**

     * Ensures {@link CentralSurfaces}

     */

    @Test

    public void testInformBouncerHidingOnCollapse() {

        // Must swipe up to set initial state.

        swipeToPosition(1f, Direction.UP, 0);

        Mockito.clearInvocations(mCentralSurfaces);



        swipeToPosition(0f, Direction.DOWN, 0);

        verify(mCentralSurfaces).setBouncerShowing(false);

    }



    private enum Direction {

        DOWN,

        UP,
@@ -443,7 +421,6 @@ public class BouncerSwipeTouchHandlerTest extends SysuiTestCase { 
    }



    private void swipeToPosition(float percent, Direction direction, float velocityY) {

        Mockito.clearInvocations(mTouchSession);

        mTouchHandler.onSessionStart(mTouchSession);

        ArgumentCaptor<GestureDetector.OnGestureListener> gestureListenerCaptor =

                ArgumentCaptor.forClass(GestureDetector.OnGestureListener.class);