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

Merge "Final position of animation is independent of starting postiion." into qt-r1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-06-24 16:12:08 +00:00
committed by Android (Google) Code Review
parent a0fd871682 ddfb065cab
commit a0f26da016
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
View File

@@ -81,6 +81,7 @@ public class KeyguardIndicationController implements StateListener,
private static final int MSG_CLEAR_BIOMETRIC_MSG = 2; private static final int MSG_CLEAR_BIOMETRIC_MSG = 2;
private static final int MSG_SWIPE_UP_TO_UNLOCK = 3; private static final int MSG_SWIPE_UP_TO_UNLOCK = 3;
private static final long TRANSIENT_BIOMETRIC_ERROR_TIMEOUT = 1300; private static final long TRANSIENT_BIOMETRIC_ERROR_TIMEOUT = 1300;
private static final float BOUNCE_ANIMATION_FINAL_Y = 0f;
private final Context mContext; private final Context mContext;
private final ShadeController mShadeController; private final ShadeController mShadeController;
@@ -422,7 +423,6 @@ public class KeyguardIndicationController implements StateListener,
int animateDownDuration = mContext.getResources().getInteger( int animateDownDuration = mContext.getResources().getInteger(
R.integer.wired_charging_keyguard_text_animation_duration_down); R.integer.wired_charging_keyguard_text_animation_duration_down);
textView.animate().cancel(); textView.animate().cancel();
float translation = textView.getTranslationY();
ViewClippingUtil.setClippingDeactivated(textView, true, mClippingParams); ViewClippingUtil.setClippingDeactivated(textView, true, mClippingParams);
textView.animate() textView.animate()
.translationYBy(yTranslation) .translationYBy(yTranslation)
@@ -438,7 +438,7 @@ public class KeyguardIndicationController implements StateListener,
@Override @Override
public void onAnimationCancel(Animator animation) { public void onAnimationCancel(Animator animation) {
textView.setTranslationY(translation); textView.setTranslationY(BOUNCE_ANIMATION_FINAL_Y);
mCancelled = true; mCancelled = true;
} }
@@ -452,15 +452,11 @@ public class KeyguardIndicationController implements StateListener,
textView.animate() textView.animate()
.setDuration(animateDownDuration) .setDuration(animateDownDuration)
.setInterpolator(Interpolators.BOUNCE) .setInterpolator(Interpolators.BOUNCE)
.translationY(translation) .translationY(BOUNCE_ANIMATION_FINAL_Y)
.setListener(new AnimatorListenerAdapter() { .setListener(new AnimatorListenerAdapter() {
@Override
public void onAnimationCancel(Animator animation) {
textView.setTranslationY(translation);
}
@Override @Override
public void onAnimationEnd(Animator animation) { public void onAnimationEnd(Animator animation) {
textView.setTranslationY(BOUNCE_ANIMATION_FINAL_Y);
ViewClippingUtil.setClippingDeactivated(textView, false, ViewClippingUtil.setClippingDeactivated(textView, false,
mClippingParams); mClippingParams);
} }