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

Merge "[Bouncer] Reset alpha and translation of view." into tm-qpr-dev

Browse Source
This commit is contained in:
Aaron Liu
2022-10-07 20:34:01 +00:00
committed by Android (Google) Code Review
parent 22ae4477ed 6916ac1217
commit e7503ef8ef
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/keyguard/KeyguardPINView.java
View File

@@ -176,6 +176,8 @@ public class KeyguardPINView extends KeyguardPinBasedInputView {
@Override @Override
public void startAppearAnimation() { public void startAppearAnimation() {
setAlpha(1f);
setTranslationY(0);
if (mAppearAnimator.isRunning()) { if (mAppearAnimator.isRunning()) {
mAppearAnimator.cancel(); mAppearAnimator.cancel();
} }

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

@@ -538,7 +538,7 @@ public class KeyguardSecurityContainer extends FrameLayout {
} }
/** /**
* Runs after a succsssful authentication only * Runs after a successful authentication only
*/ */
public void startDisappearAnimation(SecurityMode securitySelection) { public void startDisappearAnimation(SecurityMode securitySelection) {
mDisappearAnimRunning = true; mDisappearAnimRunning = true;
@@ -1063,6 +1063,7 @@ public class KeyguardSecurityContainer extends FrameLayout {
mPopup.dismiss(); mPopup.dismiss();
mPopup = null; mPopup = null;
} }
setupUserSwitcher();
} }
@Override @Override
@@ -1101,7 +1102,6 @@ public class KeyguardSecurityContainer extends FrameLayout {
return; return;
} }
mView.setAlpha(1f);
mUserSwitcherViewGroup.setAlpha(0f); mUserSwitcherViewGroup.setAlpha(0f);
ObjectAnimator alphaAnim = ObjectAnimator.ofFloat(mUserSwitcherViewGroup, View.ALPHA, ObjectAnimator alphaAnim = ObjectAnimator.ofFloat(mUserSwitcherViewGroup, View.ALPHA,
1f); 1f);

1
packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java
View File

@@ -427,6 +427,7 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard
public void startAppearAnimation() { public void startAppearAnimation() {
if (mCurrentSecurityMode != SecurityMode.None) { if (mCurrentSecurityMode != SecurityMode.None) {
mView.setAlpha(1f);
mView.startAppearAnimation(mCurrentSecurityMode); mView.startAppearAnimation(mCurrentSecurityMode);
getCurrentSecurityController().startAppearAnimation(); getCurrentSecurityController().startAppearAnimation();
} }