Merge "Remove udfps icon hide workaround" into sc-dev (04d993bb) · Commits · e / os / android_frameworks_base

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

+0 −18

Original line number	Diff line number	Diff line
		@@ -62,7 +62,6 @@ public class UdfpsKeyguardViewController extends UdfpsAnimationViewController<Ud
		private boolean mQsExpanded;
		private boolean mFaceDetectRunning;
		private boolean mHintShown;
		private boolean mTransitioningFromHome;
		private int mStatusBarState;

		/**
		@@ -127,7 +126,6 @@ public class UdfpsKeyguardViewController extends UdfpsAnimationViewController<Ud

		mStatusBarStateController.removeCallback(mStateListener);
		mKeyguardViewManager.removeAlternateAuthInterceptor(mAlternateAuthInterceptor);
		mTransitioningFromHome = false;
		mKeyguardUpdateMonitor.requestFaceAuthOnOccludingApp(false);

		if (mCancelDelayedHintRunnable != null) {
		@@ -141,7 +139,6 @@ public class UdfpsKeyguardViewController extends UdfpsAnimationViewController<Ud
		super.dump(fd, pw, args);
		pw.println("mShowingUdfpsBouncer=" + mShowingUdfpsBouncer);
		pw.println("mFaceDetectRunning=" + mFaceDetectRunning);
		pw.println("mTransitioningFromHomeToKeyguard=" + mTransitioningFromHome);
		pw.println("mStatusBarState=" + StatusBarState.toShortString(mStatusBarState));
		pw.println("mQsExpanded=" + mQsExpanded);
		pw.println("mIsBouncerVisible=" + mIsBouncerVisible);
		@@ -195,10 +192,6 @@ public class UdfpsKeyguardViewController extends UdfpsAnimationViewController<Ud
		return true;
		}

		if (mTransitioningFromHome && mKeyguardViewMediator.isAnimatingScreenOff()) {
		return true;
		}

		if (mQsExpanded) {
		return true;
		}
		@@ -277,17 +270,6 @@ public class UdfpsKeyguardViewController extends UdfpsAnimationViewController<Ud
		public void onDozeAmountChanged(float linear, float eased) {
		if (linear != 0) showUdfpsBouncer(false);
		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();
		}