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

Merge "Remove udfps icon hide workaround" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-06-08 04:07:35 +00:00
committed by Android (Google) Code Review
parent 96937de834 128292b6a9
commit 04d993bb66
1 changed files with 0 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardViewController.java
View File

@@ -62,7 +62,6 @@ public class UdfpsKeyguardViewController extends UdfpsAnimationViewController<Ud
private boolean mQsExpanded; private boolean mQsExpanded;
private boolean mFaceDetectRunning; private boolean mFaceDetectRunning;
private boolean mHintShown; private boolean mHintShown;
private boolean mTransitioningFromHome;
private int mStatusBarState; private int mStatusBarState;
/** /**
@@ -127,7 +126,6 @@ public class UdfpsKeyguardViewController extends UdfpsAnimationViewController<Ud
mStatusBarStateController.removeCallback(mStateListener); mStatusBarStateController.removeCallback(mStateListener);
mKeyguardViewManager.removeAlternateAuthInterceptor(mAlternateAuthInterceptor); mKeyguardViewManager.removeAlternateAuthInterceptor(mAlternateAuthInterceptor);
mTransitioningFromHome = false;
mKeyguardUpdateMonitor.requestFaceAuthOnOccludingApp(false); mKeyguardUpdateMonitor.requestFaceAuthOnOccludingApp(false);
if (mCancelDelayedHintRunnable != null) { if (mCancelDelayedHintRunnable != null) {
@@ -141,7 +139,6 @@ public class UdfpsKeyguardViewController extends UdfpsAnimationViewController<Ud
super.dump(fd, pw, args); super.dump(fd, pw, args);
pw.println("mShowingUdfpsBouncer=" + mShowingUdfpsBouncer); pw.println("mShowingUdfpsBouncer=" + mShowingUdfpsBouncer);
pw.println("mFaceDetectRunning=" + mFaceDetectRunning); pw.println("mFaceDetectRunning=" + mFaceDetectRunning);
pw.println("mTransitioningFromHomeToKeyguard=" + mTransitioningFromHome);
pw.println("mStatusBarState=" + StatusBarState.toShortString(mStatusBarState)); pw.println("mStatusBarState=" + StatusBarState.toShortString(mStatusBarState));
pw.println("mQsExpanded=" + mQsExpanded); pw.println("mQsExpanded=" + mQsExpanded);
pw.println("mIsBouncerVisible=" + mIsBouncerVisible); pw.println("mIsBouncerVisible=" + mIsBouncerVisible);
@@ -195,10 +192,6 @@ public class UdfpsKeyguardViewController extends UdfpsAnimationViewController<Ud
return true; return true;
} }
if (mTransitioningFromHome && mKeyguardViewMediator.isAnimatingScreenOff()) {
return true;
}
if (mQsExpanded) { if (mQsExpanded) {
return true; return true;
} }
@@ -277,17 +270,6 @@ public class UdfpsKeyguardViewController extends UdfpsAnimationViewController<Ud
public void onDozeAmountChanged(float linear, float eased) { public void onDozeAmountChanged(float linear, float eased) {
if (linear != 0) showUdfpsBouncer(false); if (linear != 0) showUdfpsBouncer(false);
mView.onDozeAmountChanged(linear, eased); mView.onDozeAmountChanged(linear, eased);
if (linear == 1f) {
// transition has finished
mTransitioningFromHome = false;
}
updatePauseAuth();
}
@Override
public void onStatePreChange(int oldState, int newState) {
mTransitioningFromHome = oldState == StatusBarState.SHADE
&& newState == StatusBarState.KEYGUARD;
updatePauseAuth(); updatePauseAuth();
} }