Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 19ecfcde authored by Kevin Chyn's avatar Kevin Chyn
Browse files

Animate height animator together with the rest of the AnimatorSet 

The height animator was using the default animation duration, thus
ending earlier, causing the invalidateOutline to not be invoked for the
remainder of the AnimatorSet's duration.

Fixes: 143371342

Test: BiometricPromptDemo, rotate to landscape, tap "Use Pattern"
Change-Id: I6a46bb2f596adc20152ed25e95a66410fd57d257
parent bf2bf1bc

packages/SystemUI/src/com/android/systemui/biometrics/AuthPanelController.java

+2 −3
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package com.android.systemui.biometrics; 
import android.animation.AnimatorSet;

import android.animation.ValueAnimator;

import android.content.Context;

import android.graphics.Color;

import android.graphics.Outline;

import android.util.Log;

import android.view.View;
@@ -142,7 +141,6 @@ public class AuthPanelController extends ViewOutlineProvider { 
                mContentHeight = (int) animation.getAnimatedValue();

                mPanelView.invalidateOutline();

            });

            heightAnimator.start();



            // Animate width

            ValueAnimator widthAnimator = ValueAnimator.ofInt(mContentWidth, contentWidth);
@@ -163,7 +161,8 @@ public class AuthPanelController extends ViewOutlineProvider { 
            AnimatorSet as = new AnimatorSet();

            as.setDuration(animateDurationMs);

            as.setInterpolator(new AccelerateDecelerateInterpolator());

            as.playTogether(cornerAnimator, widthAnimator, marginAnimator, alphaAnimator);

            as.playTogether(cornerAnimator, heightAnimator, widthAnimator, marginAnimator,

                    alphaAnimator);

            as.start();



        } else {