Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b64ca1a6 authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Android Git Automerger
Browse files

am 88a71669: am dd907b1a: am 6a388ef8: Merge "Don\'t play hint animation when... 

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

* commit '88a71669':
  Don't play hint animation when touching to wake up
parents 72bb36f5 88a71669

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

+4 −1
Original line number Diff line number Diff line
@@ -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;