From abcb0590cd79933e8012743277566159a02a0ec9 Mon Sep 17 00:00:00 2001 From: Jorim Jaggi Date: Fri, 14 Nov 2014 17:18:43 +0100 Subject: [PATCH] Don't play hint animation when touching to wake up Bug: 18146441 Change-Id: Ie7e17a26c70d4fb0dd94787cce9e5baa0d775bde --- .../src/com/android/systemui/statusbar/phone/PanelView.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java index 47ce6032c9b7f..a04474364c583 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java @@ -98,6 +98,7 @@ public abstract class PanelView extends FrameLayout { private boolean mCollapseAfterPeek; private boolean mExpanding; private boolean mGestureWaitForTouchSlop; + private boolean mDozingOnDown; private Runnable mPeekRunnable = new Runnable() { @Override public void run() { @@ -244,6 +245,7 @@ public abstract class PanelView extends FrameLayout { mUpdateFlingOnLayout = false; mPeekTouching = mPanelClosedOnDown; mTouchAboveFalsingThreshold = false; + mDozingOnDown = isDozing(); if (mVelocityTracker == null) { initVelocityTracker(); } @@ -418,6 +420,7 @@ public abstract class PanelView extends FrameLayout { mHasLayoutedSinceDown = false; mUpdateFlingOnLayout = false; mTouchAboveFalsingThreshold = false; + mDozingOnDown = isDozing(); initVelocityTracker(); trackMovement(event); break; @@ -937,7 +940,7 @@ public abstract class PanelView extends FrameLayout { private boolean onMiddleClicked() { switch (mStatusBar.getBarState()) { case StatusBarState.KEYGUARD: - if (!isDozing()) { + if (!mDozingOnDown) { startUnlockHintAnimation(); } return true;