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

Merge "Ensure BiometricDialogView dismiss animation is run" into qt-r1-dev

Browse Source
This commit is contained in:
Kevin Chyn
2019-07-25 05:08:11 +00:00
committed by Android (Google) Code Review
parent bae4081329 906bde5423
commit dcb049c30e
2 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
packages/SystemUI/src/com/android/systemui/biometrics/BiometricDialogView.java
View File

@@ -111,6 +111,9 @@ public abstract class BiometricDialogView extends LinearLayout {
protected boolean mRequireConfirmation; protected boolean mRequireConfirmation;
private int mUserId; // used to determine if we should show work background private int mUserId; // used to determine if we should show work background
private boolean mCompletedAnimatingIn;
private boolean mPendingDismissDialog;
protected abstract int getHintStringResourceId(); protected abstract int getHintStringResourceId();
protected abstract int getAuthenticatedAccessibilityResourceId(); protected abstract int getAuthenticatedAccessibilityResourceId();
protected abstract int getIconDescriptionResourceId(); protected abstract int getIconDescriptionResourceId();
@@ -332,6 +335,7 @@ public abstract class BiometricDialogView extends LinearLayout {
mDialog.setAlpha(1.0f); mDialog.setAlpha(1.0f);
mDialog.setTranslationY(0); mDialog.setTranslationY(0);
mLayout.setAlpha(1.0f); mLayout.setAlpha(1.0f);
mCompletedAnimatingIn = true;
} else { } else {
// Dim the background and slide the dialog up // Dim the background and slide the dialog up
mDialog.setTranslationY(mAnimationTranslationOffset); mDialog.setTranslationY(mAnimationTranslationOffset);
@@ -352,6 +356,12 @@ public abstract class BiometricDialogView extends LinearLayout {
} }
public void startDismiss() { public void startDismiss() {
if (!mCompletedAnimatingIn) {
Log.w(TAG, "startDismiss(): waiting for onDialogAnimatedIn");
mPendingDismissDialog = true;
return;
}
mAnimatingAway = true; mAnimatingAway = true;
// This is where final cleanup should occur. // This is where final cleanup should occur.
@@ -499,6 +509,13 @@ public abstract class BiometricDialogView extends LinearLayout {
} }
public void onDialogAnimatedIn() { public void onDialogAnimatedIn() {
mCompletedAnimatingIn = true;
if (mPendingDismissDialog) {
Log.d(TAG, "onDialogAnimatedIn(): mPendingDismissDialog=true, dismissing now");
startDismiss();
mPendingDismissDialog = false;
}
} }
public void restoreState(Bundle bundle) { public void restoreState(Bundle bundle) {

1
packages/SystemUI/src/com/android/systemui/biometrics/FaceDialogView.java
View File

@@ -460,6 +460,7 @@ public class FaceDialogView extends BiometricDialogView {
@Override @Override
public void onDialogAnimatedIn() { public void onDialogAnimatedIn() {
super.onDialogAnimatedIn();
mDialogAnimatedIn = true; mDialogAnimatedIn = true;
mIconController.startPulsing(); mIconController.startPulsing();
} }