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

Merge "Make bouncer handedness animation interruptible." into sc-v2-dev am: db885833e7

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15951504

Change-Id: Ie7111ed330c621825f3efa5371377471b23d1810
This commit is contained in:
Jamie Garside
2021-10-06 07:53:49 +00:00
committed by Automerger Merge Worker
parent 2a2de96fec db885833e7
commit 76008c2e80
1 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java
View File

@@ -21,6 +21,8 @@ import static android.view.WindowInsetsAnimation.Callback.DISPATCH_MODE_STOP;
import static java.lang.Integer.max; import static java.lang.Integer.max;
import android.animation.Animator;
import android.animation.AnimatorListenerAdapter;
import android.animation.ValueAnimator; import android.animation.ValueAnimator;
import android.app.Activity; import android.app.Activity;
import android.app.AlertDialog; import android.app.AlertDialog;
@@ -35,7 +37,6 @@ import android.view.MotionEvent;
import android.view.VelocityTracker; import android.view.VelocityTracker;
import android.view.View; import android.view.View;
import android.view.ViewConfiguration; import android.view.ViewConfiguration;
import android.view.ViewPropertyAnimator;
import android.view.WindowInsets; import android.view.WindowInsets;
import android.view.WindowInsetsAnimation; import android.view.WindowInsetsAnimation;
import android.view.WindowManager; import android.view.WindowManager;
@@ -43,6 +44,7 @@ import android.view.animation.AnimationUtils;
import android.view.animation.Interpolator; import android.view.animation.Interpolator;
import android.widget.FrameLayout; import android.widget.FrameLayout;
import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting; import androidx.annotation.VisibleForTesting;
import androidx.dynamicanimation.animation.DynamicAnimation; import androidx.dynamicanimation.animation.DynamicAnimation;
import androidx.dynamicanimation.animation.SpringAnimation; import androidx.dynamicanimation.animation.SpringAnimation;
@@ -111,7 +113,7 @@ public class KeyguardSecurityContainer extends FrameLayout {
private boolean mIsSecurityViewLeftAligned = true; private boolean mIsSecurityViewLeftAligned = true;
private boolean mOneHandedMode = false; private boolean mOneHandedMode = false;
private ViewPropertyAnimator mRunningOneHandedAnimator; @Nullable private ValueAnimator mRunningOneHandedAnimator;
private final WindowInsetsAnimation.Callback mWindowInsetsAnimationCallback = private final WindowInsetsAnimation.Callback mWindowInsetsAnimationCallback =
new WindowInsetsAnimation.Callback(DISPATCH_MODE_STOP) { new WindowInsetsAnimation.Callback(DISPATCH_MODE_STOP) {
@@ -347,9 +349,9 @@ public class KeyguardSecurityContainer extends FrameLayout {
Interpolator fadeOutInterpolator = Interpolators.FAST_OUT_LINEAR_IN; Interpolator fadeOutInterpolator = Interpolators.FAST_OUT_LINEAR_IN;
Interpolator fadeInInterpolator = Interpolators.LINEAR_OUT_SLOW_IN; Interpolator fadeInInterpolator = Interpolators.LINEAR_OUT_SLOW_IN;
ValueAnimator anim = ValueAnimator.ofFloat(0.0f, 1.0f); mRunningOneHandedAnimator = ValueAnimator.ofFloat(0.0f, 1.0f);
anim.setDuration(BOUNCER_HANDEDNESS_ANIMATION_DURATION_MS); mRunningOneHandedAnimator.setDuration(BOUNCER_HANDEDNESS_ANIMATION_DURATION_MS);
anim.setInterpolator(Interpolators.LINEAR); mRunningOneHandedAnimator.setInterpolator(Interpolators.LINEAR);
int initialTranslation = (int) mSecurityViewFlipper.getTranslationX(); int initialTranslation = (int) mSecurityViewFlipper.getTranslationX();
int totalTranslation = (int) getResources().getDimension( int totalTranslation = (int) getResources().getDimension(
@@ -361,7 +363,15 @@ public class KeyguardSecurityContainer extends FrameLayout {
mSecurityViewFlipper.setLayerType(View.LAYER_TYPE_HARDWARE, /* paint= */null); mSecurityViewFlipper.setLayerType(View.LAYER_TYPE_HARDWARE, /* paint= */null);
} }
anim.addUpdateListener(animation -> { float initialAlpha = mSecurityViewFlipper.getAlpha();
mRunningOneHandedAnimator.addListener(new AnimatorListenerAdapter() {
@Override
public void onAnimationEnd(Animator animation) {
mRunningOneHandedAnimator = null;
}
});
mRunningOneHandedAnimator.addUpdateListener(animation -> {
float switchPoint = BOUNCER_HANDEDNESS_ANIMATION_FADE_OUT_PROPORTION; float switchPoint = BOUNCER_HANDEDNESS_ANIMATION_FADE_OUT_PROPORTION;
boolean isFadingOut = animation.getAnimatedFraction() < switchPoint; boolean isFadingOut = animation.getAnimatedFraction() < switchPoint;
@@ -378,13 +388,16 @@ public class KeyguardSecurityContainer extends FrameLayout {
if (isFadingOut) { if (isFadingOut) {
// The bouncer fades out over the first X%. // The bouncer fades out over the first X%.
float fadeOutFraction = MathUtils.constrainedMap( float fadeOutFraction = MathUtils.constrainedMap(
/* rangeMin= */0.0f, /* rangeMin= */1.0f,
/* rangeMax= */1.0f, /* rangeMax= */0.0f,
/* valueMin= */0.0f, /* valueMin= */0.0f,
/* valueMax= */switchPoint, /* valueMax= */switchPoint,
animation.getAnimatedFraction()); animation.getAnimatedFraction());
float opacity = fadeOutInterpolator.getInterpolation(fadeOutFraction); float opacity = fadeOutInterpolator.getInterpolation(fadeOutFraction);
mSecurityViewFlipper.setAlpha(1f - opacity);
// When fading out, the alpha needs to start from the initial opacity of the
// view flipper, otherwise we get a weird bit of jank as it ramps back to 100%.
mSecurityViewFlipper.setAlpha(opacity * initialAlpha);
// Animate away from the source. // Animate away from the source.
mSecurityViewFlipper.setTranslationX(initialTranslation + currentTranslation); mSecurityViewFlipper.setTranslationX(initialTranslation + currentTranslation);
@@ -409,7 +422,7 @@ public class KeyguardSecurityContainer extends FrameLayout {
} }
}); });
anim.start(); mRunningOneHandedAnimator.start();
} else { } else {
mSecurityViewFlipper.setTranslationX(targetTranslation); mSecurityViewFlipper.setTranslationX(targetTranslation);
} }