From 2da425ef6547df98e2c912fa42f295e83359ffaf Mon Sep 17 00:00:00 2001 From: d34d Date: Tue, 17 May 2016 15:48:32 -0700 Subject: 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 --- .../com/android/systemui/statusbar/phone/NotificationPanelView.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'packages') 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) { -- cgit v1.1