Merge "Update showing udfps keyguard affordance logic" into sc-dev am: f43e3cabec (f92149a0) · Commits · e / os / android_frameworks_base

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

+15 −3

Original line number	Original line	Diff line number	Diff line
	@@ -33,6 +33,7 @@ public class UdfpsKeyguardViewController extends UdfpsAnimationViewController<Ud
	@NonNull private final StatusBarKeyguardViewManager mKeyguardViewManager;		@NonNull private final StatusBarKeyguardViewManager mKeyguardViewManager;

	private boolean mForceShow;		private boolean mForceShow;
			private boolean mQsExpanded;

	protected UdfpsKeyguardViewController(		protected UdfpsKeyguardViewController(
	@NonNull UdfpsKeyguardView view,		@NonNull UdfpsKeyguardView view,
	@@ -64,7 +65,7 @@ public class UdfpsKeyguardViewController extends UdfpsAnimationViewController<Ud
	protected void onViewDetached() {		protected void onViewDetached() {
	super.onViewDetached();		super.onViewDetached();
	mStatusBarStateController.removeCallback(mStateListener);		mStatusBarStateController.removeCallback(mStateListener);
	mAlternateAuthInterceptor.reset();		mAlternateAuthInterceptor.resetForceShow();
	mKeyguardViewManager.setAlternateAuthInterceptor(null);		mKeyguardViewManager.setAlternateAuthInterceptor(null);
	}		}

	@@ -100,6 +101,11 @@ public class UdfpsKeyguardViewController extends UdfpsAnimationViewController<Ud
	if (mForceShow) {		if (mForceShow) {
	return false;		return false;
	}		}

			if (mQsExpanded) {
			return true;
			}

	return super.shouldPauseAuth();		return super.shouldPauseAuth();
	}		}

	@@ -130,7 +136,7 @@ public class UdfpsKeyguardViewController extends UdfpsAnimationViewController<Ud
	}		}

	@Override		@Override
	public boolean reset() {		public boolean resetForceShow() {
	if (!mForceShow) {		if (!mForceShow) {
	return false;		return false;
	}		}
	@@ -140,7 +146,7 @@ public class UdfpsKeyguardViewController extends UdfpsAnimationViewController<Ud
	}		}

	@Override		@Override
	public boolean isShowingAlternativeAuth() {		public boolean isShowingAlternateAuth() {
	return mForceShow;		return mForceShow;
	}		}

	@@ -149,6 +155,12 @@ public class UdfpsKeyguardViewController extends UdfpsAnimationViewController<Ud
	return mView.isAnimating();		return mView.isAnimating();
	}		}

			@Override
			public void setQsExpanded(boolean expanded) {
			mQsExpanded = expanded;
			updatePauseAuth();
			}

	@Override		@Override
	public void dump(PrintWriter pw) {		public void dump(PrintWriter pw) {
	pw.print(getTag());		pw.print(getTag());

packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java

+4 −3

Original line number	Original line	Diff line number	Diff line
	@@ -1824,6 +1824,7 @@ public class NotificationPanelViewController extends PanelViewController {
	mNotificationContainerParent.setQsExpanded(expanded);		mNotificationContainerParent.setQsExpanded(expanded);
	mPulseExpansionHandler.setQsExpanded(expanded);		mPulseExpansionHandler.setQsExpanded(expanded);
	mKeyguardBypassController.setQSExpanded(expanded);		mKeyguardBypassController.setQSExpanded(expanded);
			mStatusBarKeyguardViewManager.setQsExpanded(expanded);
	}		}
	}		}

	@@ -3389,7 +3390,7 @@ public class NotificationPanelViewController extends PanelViewController {
	return new TouchHandler() {		return new TouchHandler() {
	@Override		@Override
	public boolean onInterceptTouchEvent(MotionEvent event) {		public boolean onInterceptTouchEvent(MotionEvent event) {
	if (mStatusBarKeyguardViewManager.isShowingAlternativeAuthOrAnimating()) {		if (mStatusBarKeyguardViewManager.isShowingAlternateAuthOrAnimating()) {
	return true;		return true;
	}		}
	if (mBlockTouches \|\| mQsFullyExpanded && mQs.disallowPanelTouches()) {		if (mBlockTouches \|\| mQsFullyExpanded && mQs.disallowPanelTouches()) {
	@@ -3420,8 +3421,8 @@ public class NotificationPanelViewController extends PanelViewController {
	@Override		@Override
	public boolean onTouch(View v, MotionEvent event) {		public boolean onTouch(View v, MotionEvent event) {
	final boolean showingOrAnimatingAltAuth =		final boolean showingOrAnimatingAltAuth =
	mStatusBarKeyguardViewManager.isShowingAlternativeAuthOrAnimating();		mStatusBarKeyguardViewManager.isShowingAlternateAuthOrAnimating();
	if (showingOrAnimatingAltAuth) {		if (showingOrAnimatingAltAuth && event.getAction() == MotionEvent.ACTION_DOWN) {
	mStatusBarKeyguardViewManager.resetAlternateAuth();		mStatusBarKeyguardViewManager.resetAlternateAuth();
	}		}

packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelViewController.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -454,7 +454,7 @@ public abstract class PanelViewController {
	mView.postOnAnimation(mPostCollapseRunnable);		mView.postOnAnimation(mPostCollapseRunnable);
	}		}
	} else if (!mStatusBar.isBouncerShowing()		} else if (!mStatusBar.isBouncerShowing()
	&& !mStatusBarKeyguardViewManager.isShowingAlternativeAuthOrAnimating()) {		&& !mStatusBarKeyguardViewManager.isShowingAlternateAuthOrAnimating()) {
	boolean expands = onEmptySpaceClick(mInitialTouchX);		boolean expands = onEmptySpaceClick(mInitialTouchX);
	onTrackingStopped(expands);		onTrackingStopped(expands);
	}		}

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -4224,7 +4224,7 @@ public class StatusBar extends SystemUI implements DemoMode,
	mNotificationPanelViewController.isLaunchingAffordanceWithPreview();		mNotificationPanelViewController.isLaunchingAffordanceWithPreview();
	mScrimController.setLaunchingAffordanceWithPreview(launchingAffordanceWithPreview);		mScrimController.setLaunchingAffordanceWithPreview(launchingAffordanceWithPreview);

	if (mStatusBarKeyguardViewManager.isShowingAlternativeAuth()) {		if (mStatusBarKeyguardViewManager.isShowingAlternateAuth()) {
	mScrimController.transitionTo(ScrimState.AUTH_SCRIMMED);		mScrimController.transitionTo(ScrimState.AUTH_SCRIMMED);
	} else if (mBouncerShowing) {		} else if (mBouncerShowing) {
	// Bouncer needs the front scrim when it's on top of an activity,		// Bouncer needs the front scrim when it's on top of an activity,

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java

+25 −10

Original line number	Original line	Diff line number	Diff line
	@@ -476,11 +476,12 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
	return;		return;
	}		}

	if (mAlternateAuthInterceptor != null		if (mAlternateAuthInterceptor != null) {
	&& mAlternateAuthInterceptor.showAlternativeAuthMethod()) {
	mStatusBar.updateScrimController();
	mAfterKeyguardGoneAction = r;		mAfterKeyguardGoneAction = r;
	mKeyguardGoneCancelAction = cancelAction;		mKeyguardGoneCancelAction = cancelAction;
			if (mAlternateAuthInterceptor.showAlternativeAuthMethod()) {
			mStatusBar.updateScrimController();
			}
	return;		return;
	}		}

	@@ -528,7 +529,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
	* Stop showing any alternate auth methods		* Stop showing any alternate auth methods
	*/		*/
	public void resetAlternateAuth() {		public void resetAlternateAuth() {
	if (mAlternateAuthInterceptor != null && mAlternateAuthInterceptor.reset()) {		if (mAlternateAuthInterceptor != null && mAlternateAuthInterceptor.resetForceShow()) {
	mStatusBar.updateScrimController();		mStatusBar.updateScrimController();
	}		}
	}		}
	@@ -1125,18 +1126,27 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
	setDozing(isDozing);		setDozing(isDozing);
	}		}

			/**
			* Set whether qs is currently expanded
			*/
			public void setQsExpanded(boolean expanded) {
			if (mAlternateAuthInterceptor != null) {
			mAlternateAuthInterceptor.setQsExpanded(expanded);
			}
			}

	public KeyguardBouncer getBouncer() {		public KeyguardBouncer getBouncer() {
	return mBouncer;		return mBouncer;
	}		}

	public boolean isShowingAlternativeAuth() {		public boolean isShowingAlternateAuth() {
	return mAlternateAuthInterceptor != null		return mAlternateAuthInterceptor != null
	&& mAlternateAuthInterceptor.isShowingAlternativeAuth();		&& mAlternateAuthInterceptor.isShowingAlternateAuth();
	}		}

	public boolean isShowingAlternativeAuthOrAnimating() {		public boolean isShowingAlternateAuthOrAnimating() {
	return mAlternateAuthInterceptor != null		return mAlternateAuthInterceptor != null
	&& (mAlternateAuthInterceptor.isShowingAlternativeAuth()		&& (mAlternateAuthInterceptor.isShowingAlternateAuth()
	\|\| mAlternateAuthInterceptor.isAnimating());		\|\| mAlternateAuthInterceptor.isAnimating());
	}		}

	@@ -1169,12 +1179,12 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
	* reset the state to the default (only keyguard showing, no auth methods showing)		* reset the state to the default (only keyguard showing, no auth methods showing)
	* @return whether alternative auth method was newly hidden		* @return whether alternative auth method was newly hidden
	*/		*/
	boolean reset();		boolean resetForceShow();

	/**		/**
	* @return true if alternative auth method is showing		* @return true if alternative auth method is showing
	*/		*/
	boolean isShowingAlternativeAuth();		boolean isShowingAlternateAuth();

	/**		/**
	* print information for the alternate auth interceptor registered		* print information for the alternate auth interceptor registered
	@@ -1185,5 +1195,10 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
	* @return true if the new auth method is currently animating in or out.		* @return true if the new auth method is currently animating in or out.
	*/		*/
	boolean isAnimating();		boolean isAnimating();

			/**
			* Set whether qs is currently expanded
			*/
			void setQsExpanded(boolean expanded);
	}		}
	}		}