Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixed a bug where the indication text could get too high" into lmp-mr1-dev

Browse Source
This commit is contained in:
Selim Cinek
2014-10-24 14:57:00 +00:00
committed by Android (Google) Code Review
parent 55abbfa0ed 5256d93121
commit 2985dd763b
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java
View File

@@ -68,7 +68,6 @@ public abstract class PanelView extends FrameLayout {
protected int mTouchSlop; protected int mTouchSlop;
protected boolean mHintAnimationRunning; protected boolean mHintAnimationRunning;
private boolean mOverExpandedBeforeFling; private boolean mOverExpandedBeforeFling;
private float mOriginalIndicationY;
private boolean mTouchAboveFalsingThreshold; private boolean mTouchAboveFalsingThreshold;
private int mUnlockFalsingThreshold; private int mUnlockFalsingThreshold;
@@ -841,16 +840,15 @@ public abstract class PanelView extends FrameLayout {
}); });
animator.start(); animator.start();
mHeightAnimator = animator; mHeightAnimator = animator;
mOriginalIndicationY = mKeyguardBottomArea.getIndicationView().getY();
mKeyguardBottomArea.getIndicationView().animate() mKeyguardBottomArea.getIndicationView().animate()
.y(mOriginalIndicationY - mHintDistance) .translationY(-mHintDistance)
.setDuration(250) .setDuration(250)
.setInterpolator(mFastOutSlowInInterpolator) .setInterpolator(mFastOutSlowInInterpolator)
.withEndAction(new Runnable() { .withEndAction(new Runnable() {
@Override @Override
public void run() { public void run() {
mKeyguardBottomArea.getIndicationView().animate() mKeyguardBottomArea.getIndicationView().animate()
.y(mOriginalIndicationY) .translationY(0)
.setDuration(450) .setDuration(450)
.setInterpolator(mBounceInterpolator) .setInterpolator(mBounceInterpolator)
.start(); .start();