From 1f6fb398d71b381a4c353e524449c5c2839c558d Mon Sep 17 00:00:00 2001
From: Bryce Lee <brycelee@google.com>
Date: Mon, 11 Apr 2022 19:14:12 +0000
Subject: [PATCH] Revert "Do not allow panel expansion with bouncer over
 dream."

This reverts commit 5cb83b89ddc9d581d392b76b347ed53d09e28e66.

Reason for revert: Causes issues with transition animations

Test: manual
Change-Id: I82c6d3a6f78622fad37352d0f01ab1fbc8023185
---
 .../touch/BouncerSwipeTouchHandler.java       |  3 ---
 .../statusbar/phone/CentralSurfaces.java      | 11 ++++-----
 .../statusbar/phone/PanelViewController.java  |  2 --
 .../touch/BouncerSwipeTouchHandlerTest.java   | 23 -------------------
 4 files changed, 5 insertions(+), 34 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/dreams/touch/BouncerSwipeTouchHandler.java b/packages/SystemUI/src/com/android/systemui/dreams/touch/BouncerSwipeTouchHandler.java
index aa28c54933565..c147fde65cf75 100644
--- a/packages/SystemUI/src/com/android/systemui/dreams/touch/BouncerSwipeTouchHandler.java
+++ b/packages/SystemUI/src/com/android/systemui/dreams/touch/BouncerSwipeTouchHandler.java
@@ -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);
     }
 
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfaces.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfaces.java
index eefa10bf495af..c77b0d6721fb6 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfaces.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfaces.java
@@ -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);
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelViewController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelViewController.java
index c850755d7f8ed..518a9181ec985 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelViewController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelViewController.java
@@ -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
diff --git a/packages/SystemUI/tests/src/com/android/systemui/dreams/touch/BouncerSwipeTouchHandlerTest.java b/packages/SystemUI/tests/src/com/android/systemui/dreams/touch/BouncerSwipeTouchHandlerTest.java
index 33fb5a225f418..e175af7a037d5 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/dreams/touch/BouncerSwipeTouchHandlerTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/dreams/touch/BouncerSwipeTouchHandlerTest.java
@@ -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);