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

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

Browse Source 
* commit '2985dd763b21c63f54ef3d5f26cae249480ea05a':
  Fixed a bug where the indication text could get too high
This commit is contained in:
Selim Cinek
2014-10-24 15:03:06 +00:00
committed by Android Git Automerger
parent 8b4170547e 2985dd763b
commit 962c5ab849
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 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();