Fixed a bug where the indication text could get too high

Bug: 17645187
Change-Id: I8b526be55cd554ae4656797ea5e737135952d32c
This commit is contained in:
Selim Cinek
2014-10-22 20:05:03 +02:00
parent 2b8f9f87ff
commit 5256d93121

View File

@@ -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();