Merge "AOD: Follow-up to I0fa53616db09be98d33ea7d06b38d8ff3037707f" into... (15e6f125) · Commits · e / os / android_frameworks_base

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

+14 −14

Original line number	Original line	Diff line number	Diff line
	@@ -103,7 +103,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
	private boolean mDeferScrimFadeOut;		private boolean mDeferScrimFadeOut;

	// Dismiss action to be launched when we stop dozing or the keyguard is gone.		// Dismiss action to be launched when we stop dozing or the keyguard is gone.
	private PendingDismissActionRequest mPendingDismissAction;		private DismissWithActionRequest mPendingWakeupAction;

	private final KeyguardUpdateMonitorCallback mUpdateMonitorCallback =		private final KeyguardUpdateMonitorCallback mUpdateMonitorCallback =
	new KeyguardUpdateMonitorCallback() {		new KeyguardUpdateMonitorCallback() {
	@@ -174,7 +174,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb

	private void hideBouncer(boolean destroyView) {		private void hideBouncer(boolean destroyView) {
	mBouncer.hide(destroyView);		mBouncer.hide(destroyView);
	cancelPendingDismissAction();		cancelPendingWakeupAction();
	}		}

	private void showBouncer() {		private void showBouncer() {
	@@ -187,11 +187,11 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
	public void dismissWithAction(OnDismissAction r, Runnable cancelAction,		public void dismissWithAction(OnDismissAction r, Runnable cancelAction,
	boolean afterKeyguardGone) {		boolean afterKeyguardGone) {
	if (mShowing) {		if (mShowing) {
	cancelPendingDismissAction();		cancelPendingWakeupAction();
	// If we're dozing, this needs to be delayed until after we wake up - unless we're		// If we're dozing, this needs to be delayed until after we wake up - unless we're
	// wake-and-unlocking, because there dozing will last until the end of the transition.		// wake-and-unlocking, because there dozing will last until the end of the transition.
	if (mDozing && !isWakeAndUnlocking()) {		if (mDozing && !isWakeAndUnlocking()) {
	mPendingDismissAction = new PendingDismissActionRequest(		mPendingWakeupAction = new DismissWithActionRequest(
	r, cancelAction, afterKeyguardGone);		r, cancelAction, afterKeyguardGone);
	return;		return;
	}		}
	@@ -280,7 +280,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
	updateStates();		updateStates();

	if (!dozing) {		if (!dozing) {
	launchPendingDismissAction();		launchPendingWakeupAction();
	}		}
	}		}
	}		}
	@@ -357,7 +357,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
	*/		*/
	public void hide(long startTime, long fadeoutDuration) {		public void hide(long startTime, long fadeoutDuration) {
	mShowing = false;		mShowing = false;
	launchPendingDismissAction();		launchPendingWakeupAction();

	if (KeyguardUpdateMonitor.getInstance(mContext).needsSlowUnlockTransition()) {		if (KeyguardUpdateMonitor.getInstance(mContext).needsSlowUnlockTransition()) {
	fadeoutDuration = KEYGUARD_DISMISS_DURATION_LOCKED;		fadeoutDuration = KEYGUARD_DISMISS_DURATION_LOCKED;
	@@ -685,9 +685,9 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
	return mStatusBar.getStatusBarView().getViewRootImpl();		return mStatusBar.getStatusBarView().getViewRootImpl();
	}		}

	public void launchPendingDismissAction() {		public void launchPendingWakeupAction() {
	PendingDismissActionRequest request = mPendingDismissAction;		DismissWithActionRequest request = mPendingWakeupAction;
	mPendingDismissAction = null;		mPendingWakeupAction = null;
	if (request != null) {		if (request != null) {
	if (mShowing) {		if (mShowing) {
	dismissWithAction(request.dismissAction, request.cancelAction,		dismissWithAction(request.dismissAction, request.cancelAction,
	@@ -698,20 +698,20 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
	}		}
	}		}

	public void cancelPendingDismissAction() {		public void cancelPendingWakeupAction() {
	PendingDismissActionRequest request = mPendingDismissAction;		DismissWithActionRequest request = mPendingWakeupAction;
	mPendingDismissAction = null;		mPendingWakeupAction = null;
	if (request != null && request.cancelAction != null) {		if (request != null && request.cancelAction != null) {
	request.cancelAction.run();		request.cancelAction.run();
	}		}
	}		}

	private static class PendingDismissActionRequest {		private static class DismissWithActionRequest {
	final OnDismissAction dismissAction;		final OnDismissAction dismissAction;
	final Runnable cancelAction;		final Runnable cancelAction;
	final boolean afterKeyguardGone;		final boolean afterKeyguardGone;

	PendingDismissActionRequest(OnDismissAction dismissAction, Runnable cancelAction,		DismissWithActionRequest(OnDismissAction dismissAction, Runnable cancelAction,
	boolean afterKeyguardGone) {		boolean afterKeyguardGone) {
	this.dismissAction = dismissAction;		this.dismissAction = dismissAction;
	this.cancelAction = cancelAction;		this.cancelAction = cancelAction;