Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 6a388ef8: Merge "Don\'t play hint animation when touching to wake up" into lmp-mr1-dev

Browse Source 
* commit '6a388ef85eed7659cc5175591e4c7bbaa1b448f6':
  Don't play hint animation when touching to wake up
This commit is contained in:
Jorim Jaggi
2014-11-17 19:25:45 +00:00
committed by Android Git Automerger
parent 477226bb63 6a388ef85e
commit dd907b1a94
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java
View File

@@ -98,6 +98,7 @@ public abstract class PanelView extends FrameLayout {
private boolean mCollapseAfterPeek; private boolean mCollapseAfterPeek;
private boolean mExpanding; private boolean mExpanding;
private boolean mGestureWaitForTouchSlop; private boolean mGestureWaitForTouchSlop;
private boolean mDozingOnDown;
private Runnable mPeekRunnable = new Runnable() { private Runnable mPeekRunnable = new Runnable() {
@Override @Override
public void run() { public void run() {
@@ -244,6 +245,7 @@ public abstract class PanelView extends FrameLayout {
mUpdateFlingOnLayout = false; mUpdateFlingOnLayout = false;
mPeekTouching = mPanelClosedOnDown; mPeekTouching = mPanelClosedOnDown;
mTouchAboveFalsingThreshold = false; mTouchAboveFalsingThreshold = false;
mDozingOnDown = isDozing();
if (mVelocityTracker == null) { if (mVelocityTracker == null) {
initVelocityTracker(); initVelocityTracker();
} }
@@ -418,6 +420,7 @@ public abstract class PanelView extends FrameLayout {
mHasLayoutedSinceDown = false; mHasLayoutedSinceDown = false;
mUpdateFlingOnLayout = false; mUpdateFlingOnLayout = false;
mTouchAboveFalsingThreshold = false; mTouchAboveFalsingThreshold = false;
mDozingOnDown = isDozing();
initVelocityTracker(); initVelocityTracker();
trackMovement(event); trackMovement(event);
break; break;
@@ -937,7 +940,7 @@ public abstract class PanelView extends FrameLayout {
private boolean onMiddleClicked() { private boolean onMiddleClicked() {
switch (mStatusBar.getBarState()) { switch (mStatusBar.getBarState()) {
case StatusBarState.KEYGUARD: case StatusBarState.KEYGUARD:
if (!isDozing()) { if (!mDozingOnDown) {
startUnlockHintAnimation(); startUnlockHintAnimation();
} }
return true; return true;