diff options
| author | John Spurlock <jspurlock@google.com> | 2012-11-02 11:07:00 -0400 |
|---|---|---|
| committer | John Spurlock <jspurlock@google.com> | 2012-11-02 11:07:00 -0400 |
| commit | 78a8f126a9af0c4994188adeba1b955b5d4afd28 (patch) | |
| tree | 3ee0c198296040e42d461c918801d8d5012727a6 | |
| parent | a9b468248dde3e9b6b1971e7c580b82a308820bd (diff) | |
| download | frameworks_base-78a8f126a9af0c4994188adeba1b955b5d4afd28.zip frameworks_base-78a8f126a9af0c4994188adeba1b955b5d4afd28.tar.gz frameworks_base-78a8f126a9af0c4994188adeba1b955b5d4afd28.tar.bz2 | |
Properly disable challenge handle.
Bug:7464304
Change-Id: Ib69ccc66bbd348fc3ad17e5097522a0976838daa
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/keyguard/SlidingChallengeLayout.java | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/policy/src/com/android/internal/policy/impl/keyguard/SlidingChallengeLayout.java b/policy/src/com/android/internal/policy/impl/keyguard/SlidingChallengeLayout.java index 85997b8..fc12aa9 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/SlidingChallengeLayout.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/SlidingChallengeLayout.java @@ -122,7 +122,6 @@ public class SlidingChallengeLayout extends ViewGroup implements ChallengeLayout private final Rect mTempRect = new Rect(); private boolean mHasGlowpad; - private boolean mChallengeInteractive = true; static final Property<SlidingChallengeLayout, Float> HANDLE_ALPHA = new FloatProperty<SlidingChallengeLayout>("handleAlpha") { @@ -187,7 +186,7 @@ public class SlidingChallengeLayout extends ViewGroup implements ChallengeLayout private final OnClickListener mExpandChallengeClickListener = new OnClickListener() { @Override public void onClick(View v) { - if (!isChallengeShowing() && mChallengeInteractive) { + if (!isChallengeShowing()) { showChallenge(true); } } @@ -277,7 +276,9 @@ public class SlidingChallengeLayout extends ViewGroup implements ChallengeLayout } public void setChallengeInteractive(boolean interactive) { - mChallengeInteractive = interactive; + if (mExpandChallengeView != null) { + mExpandChallengeView.setEnabled(interactive); + } } void animateHandle(boolean visible) { @@ -584,7 +585,7 @@ public class SlidingChallengeLayout extends ViewGroup implements ChallengeLayout for (int i = 0; i < count; i++) { final float x = ev.getX(i); final float y = ev.getY(i); - if (!mIsBouncing && mChallengeInteractive && mActivePointerId == INVALID_POINTER + if (!mIsBouncing && mActivePointerId == INVALID_POINTER && (crossedDragHandle(x, y, mGestureStartY) || (isInChallengeView(x, y) && mScrollState == SCROLL_STATE_SETTLING))) { @@ -632,7 +633,7 @@ public class SlidingChallengeLayout extends ViewGroup implements ChallengeLayout break; case MotionEvent.ACTION_CANCEL: - if (mDragging && mChallengeInteractive) { + if (mDragging) { showChallenge(0); } resetTouch(); @@ -643,7 +644,7 @@ public class SlidingChallengeLayout extends ViewGroup implements ChallengeLayout break; } case MotionEvent.ACTION_UP: - if (mDragging && mChallengeInteractive) { + if (mDragging) { mVelocityTracker.computeCurrentVelocity(1000, mMaxVelocity); showChallenge((int) mVelocityTracker.getYVelocity(mActivePointerId)); } @@ -659,8 +660,7 @@ public class SlidingChallengeLayout extends ViewGroup implements ChallengeLayout if ((isInDragHandle(x, y) || crossedDragHandle(x, y, mGestureStartY) || (isInChallengeView(x, y) && mScrollState == SCROLL_STATE_SETTLING)) - && mActivePointerId == INVALID_POINTER - && mChallengeInteractive) { + && mActivePointerId == INVALID_POINTER) { mGestureStartX = x; mGestureStartY = y; mActivePointerId = ev.getPointerId(i); |