diff options
| author | Selim Cinek <cinek@google.com> | 2014-10-24 14:57:00 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-24 14:57:01 +0000 |
| commit | 2985dd763b21c63f54ef3d5f26cae249480ea05a (patch) | |
| tree | d3eacc2f8f1e1723a1673cd9894e330daf2e2ea6 /packages/SystemUI/src | |
| parent | 55abbfa0ed92a742506175ab50e983a80a9bdabe (diff) | |
| parent | 5256d93121d03b8d23053eead8c11bb3c43db109 (diff) | |
| download | frameworks_base-2985dd763b21c63f54ef3d5f26cae249480ea05a.zip frameworks_base-2985dd763b21c63f54ef3d5f26cae249480ea05a.tar.gz frameworks_base-2985dd763b21c63f54ef3d5f26cae249480ea05a.tar.bz2 | |
Merge "Fixed a bug where the indication text could get too high" into lmp-mr1-dev
Diffstat (limited to 'packages/SystemUI/src')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java | 6 |
1 files changed, 2 insertions, 4 deletions
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 a7ff0bd..24797b2 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java @@ -68,7 +68,6 @@ public abstract class PanelView extends FrameLayout { protected int mTouchSlop; protected boolean mHintAnimationRunning; private boolean mOverExpandedBeforeFling; - private float mOriginalIndicationY; private boolean mTouchAboveFalsingThreshold; private int mUnlockFalsingThreshold; @@ -841,16 +840,15 @@ public abstract class PanelView extends FrameLayout { }); animator.start(); mHeightAnimator = animator; - mOriginalIndicationY = mKeyguardBottomArea.getIndicationView().getY(); mKeyguardBottomArea.getIndicationView().animate() - .y(mOriginalIndicationY - mHintDistance) + .translationY(-mHintDistance) .setDuration(250) .setInterpolator(mFastOutSlowInInterpolator) .withEndAction(new Runnable() { @Override public void run() { mKeyguardBottomArea.getIndicationView().animate() - .y(mOriginalIndicationY) + .translationY(0) .setDuration(450) .setInterpolator(mBounceInterpolator) .start(); |