diff options
| author | Selim Cinek <cinek@google.com> | 2015-07-07 19:19:03 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-07 19:19:05 +0000 |
| commit | 7e675645a9f02ae2273291d31673164177b7be0b (patch) | |
| tree | 1e6ec39ccf370885e258540d59524094ae37c12e /packages/SystemUI | |
| parent | 54d1f0439eb0fef47e9e9c7ac3d6ec5b283c4793 (diff) | |
| parent | 158af6a0285409398332c8d84d46fe43959a51f6 (diff) | |
| download | frameworks_base-7e675645a9f02ae2273291d31673164177b7be0b.zip frameworks_base-7e675645a9f02ae2273291d31673164177b7be0b.tar.gz frameworks_base-7e675645a9f02ae2273291d31673164177b7be0b.tar.bz2 | |
Merge "Fixed keyguard affordances" into mnc-dev
Diffstat (limited to 'packages/SystemUI')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardAffordanceHelper.java | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardAffordanceHelper.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardAffordanceHelper.java index 0877ff9..6670ae0 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardAffordanceHelper.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardAffordanceHelper.java @@ -68,25 +68,11 @@ public class KeyguardAffordanceHelper { private View mTargetedView; private boolean mTouchSlopExeeded; private AnimatorListenerAdapter mFlingEndListener = new AnimatorListenerAdapter() { - public boolean mCancelled; - @Override public void onAnimationEnd(Animator animation) { mSwipeAnimator = null; mSwipingInProgress = false; - if (!mCancelled) { - mTargetedView = null; - } - } - - @Override - public void onAnimationCancel(Animator animation) { - mCancelled = true; - } - - @Override - public void onAnimationStart(Animator animation) { - mCancelled = false; + mTargetedView = null; } }; private Runnable mAnimationEndRunnable = new Runnable() { @@ -290,7 +276,6 @@ public class KeyguardAffordanceHelper { * Phase 2: Move back. */ private void startUnlockHintAnimationPhase2(boolean right, final Runnable onFinishedListener) { - final KeyguardAffordanceView targetView = right ? mRightIcon : mLeftIcon; ValueAnimator animator = getAnimatorToRadius(right, 0); animator.addListener(new AnimatorListenerAdapter() { @Override @@ -513,9 +498,7 @@ public class KeyguardAffordanceHelper { } public void reset(boolean animate) { - if (mSwipeAnimator != null) { - mSwipeAnimator.cancel(); - } + cancelAnimation(); setTranslation(0.0f, true, animate); mMotionCancelled = true; if (mSwipingInProgress) { |