SysUI: Check swiping progress before collapsing KBA

Collapsing the KeyguardBottomArea while a swipe is in progress causes
the window to collapse to a smaller size and cut off the circular
animations from the affordance views.  Luckliy there is a method we
can call to see if we are in such a state, so let's use it.

Change-Id: I45241ed17c3c90580fb04845700f5632b34db187
TICKET: CYNGNOS-2824

1 files changed, 4 insertions, 1 deletions

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
index d8ddd20..561885e 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
@@ -472,7 +472,10 @@ public class NotificationPanelView extends PanelView implements
                 boolean intercept = false;
                 if (mLiveLockscreenController.getLiveLockScreenHasFocus()) {
                     intercept = mAfforanceHelper.onTouchEvent(e);
-                    if (isCancelOrUp) {
+                    // If the touch did not originate on the affordance helper,
+                    // we must collapse the panel here since we can't rely on
+                    // the swipe callbacks from being invoked.
+                    if (isCancelOrUp && !isAffordanceSwipeInProgress()) {
                         mKeyguardBottomArea.expand(false);
                     }
                     if (!intercept) {