diff options
| author | Selim Cinek <cinek@google.com> | 2014-10-22 20:05:03 +0200 |
|---|---|---|
| committer | Selim Cinek <cinek@google.com> | 2014-10-22 21:13:46 +0000 |
| commit | 5256d93121d03b8d23053eead8c11bb3c43db109 (patch) | |
| tree | b655109c43aac03ca1206e3c795df6a2310c3cbd /packages/SystemUI/src/com | |
| parent | 2b8f9f87ff127983af4c365b70d76d41c6f7f21c (diff) | |
| download | frameworks_base-5256d93121d03b8d23053eead8c11bb3c43db109.zip frameworks_base-5256d93121d03b8d23053eead8c11bb3c43db109.tar.gz frameworks_base-5256d93121d03b8d23053eead8c11bb3c43db109.tar.bz2 | |
Fixed a bug where the indication text could get too high
Bug: 17645187
Change-Id: I8b526be55cd554ae4656797ea5e737135952d32c
Diffstat (limited to 'packages/SystemUI/src/com')
| -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(); |