Merge "Remove phone specific shade controller from KeyguardViewMediator" into... (34ce0c31) · Commits · e / os / android_frameworks_base

packages/CarSystemUI/src/com/android/systemui/car/keyguard/CarKeyguardViewController.java

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -263,6 +263,11 @@ public class CarKeyguardViewController extends OverlayViewController implements
	// no-op		// no-op
	}		}

			@Override
			public void setKeyguardGoingAwayState(boolean isKeyguardGoingAway) {
			// no-op
			}

	@Override		@Override
	public void onStartedGoingToSleep() {		public void onStartedGoingToSleep() {
	// no-op		// no-op

packages/SystemUI/src/com/android/keyguard/KeyguardViewController.java

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -113,6 +113,11 @@ public interface KeyguardViewController {
	*/		*/
	void keyguardGoingAway();		void keyguardGoingAway();

			/**
			* Sets the system state depending on whether the keyguard is going away or not.
			*/
			void setKeyguardGoingAwayState(boolean isKeyguardGoingAway);

	/**		/**
	* @return Whether window animation for unlock should be disabled.		* @return Whether window animation for unlock should be disabled.
	*/		*/

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+5 −8

Original line number	Original line	Diff line number	Diff line
	@@ -96,7 +96,6 @@ import com.android.systemui.statusbar.phone.BiometricUnlockController;
	import com.android.systemui.statusbar.phone.KeyguardBypassController;		import com.android.systemui.statusbar.phone.KeyguardBypassController;
	import com.android.systemui.statusbar.phone.NavigationModeController;		import com.android.systemui.statusbar.phone.NavigationModeController;
	import com.android.systemui.statusbar.phone.NotificationPanelViewController;		import com.android.systemui.statusbar.phone.NotificationPanelViewController;
	import com.android.systemui.statusbar.phone.NotificationShadeWindowController;
	import com.android.systemui.statusbar.phone.StatusBar;		import com.android.systemui.statusbar.phone.StatusBar;
	import com.android.systemui.util.DeviceConfigProxy;		import com.android.systemui.util.DeviceConfigProxy;
	import com.android.systemui.util.InjectionInflationController;		import com.android.systemui.util.InjectionInflationController;
	@@ -216,7 +215,6 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable {
	private AlarmManager mAlarmManager;		private AlarmManager mAlarmManager;
	private AudioManager mAudioManager;		private AudioManager mAudioManager;
	private StatusBarManager mStatusBarManager;		private StatusBarManager mStatusBarManager;
	private final NotificationShadeWindowController mNotificationShadeWindowController;
	private final Executor mUiBgExecutor;		private final Executor mUiBgExecutor;

	private boolean mSystemReady;		private boolean mSystemReady;
	@@ -628,7 +626,7 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable {
	@Override		@Override
	public void keyguardGone() {		public void keyguardGone() {
	Trace.beginSection("KeyguardViewMediator.mViewMediatorCallback#keyguardGone");		Trace.beginSection("KeyguardViewMediator.mViewMediatorCallback#keyguardGone");
	mNotificationShadeWindowController.setKeyguardGoingAway(false);		mKeyguardViewControllerLazy.get().setKeyguardGoingAwayState(false);
	mKeyguardDisplayManager.hide();		mKeyguardDisplayManager.hide();
	Trace.endSection();		Trace.endSection();
	}		}
	@@ -717,7 +715,6 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable {
	FalsingManager falsingManager,		FalsingManager falsingManager,
	LockPatternUtils lockPatternUtils,		LockPatternUtils lockPatternUtils,
	BroadcastDispatcher broadcastDispatcher,		BroadcastDispatcher broadcastDispatcher,
	NotificationShadeWindowController notificationShadeWindowController,
	Lazy<KeyguardViewController> statusBarKeyguardViewManagerLazy,		Lazy<KeyguardViewController> statusBarKeyguardViewManagerLazy,
	DismissCallbackRegistry dismissCallbackRegistry,		DismissCallbackRegistry dismissCallbackRegistry,
	KeyguardUpdateMonitor keyguardUpdateMonitor, DumpManager dumpManager,		KeyguardUpdateMonitor keyguardUpdateMonitor, DumpManager dumpManager,
	@@ -729,7 +726,6 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable {
	mFalsingManager = falsingManager;		mFalsingManager = falsingManager;
	mLockPatternUtils = lockPatternUtils;		mLockPatternUtils = lockPatternUtils;
	mBroadcastDispatcher = broadcastDispatcher;		mBroadcastDispatcher = broadcastDispatcher;
	mNotificationShadeWindowController = notificationShadeWindowController;
	mKeyguardViewControllerLazy = statusBarKeyguardViewManagerLazy;		mKeyguardViewControllerLazy = statusBarKeyguardViewManagerLazy;
	mDismissCallbackRegistry = dismissCallbackRegistry;		mDismissCallbackRegistry = dismissCallbackRegistry;
	mUiBgExecutor = uiBgExecutor;		mUiBgExecutor = uiBgExecutor;
	@@ -877,7 +873,8 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable {
	mGoingToSleep = true;		mGoingToSleep = true;

	// Reset keyguard going away state so we can start listening for fingerprint. We		// Reset keyguard going away state so we can start listening for fingerprint. We
	// explicitly DO NOT want to call mStatusBarWindowController.setKeyguardGoingAway(false)		// explicitly DO NOT want to call
			// mKeyguardViewControllerLazy.get().setKeyguardGoingAwayState(false)
	// here, since that will mess with the device lock state.		// here, since that will mess with the device lock state.
	mUpdateMonitor.setKeyguardGoingAway(false);		mUpdateMonitor.setKeyguardGoingAway(false);

	@@ -1861,7 +1858,7 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable {
	adjustStatusBarLocked();		adjustStatusBarLocked();
	userActivity();		userActivity();
	mUpdateMonitor.setKeyguardGoingAway(false);		mUpdateMonitor.setKeyguardGoingAway(false);
	mNotificationShadeWindowController.setKeyguardGoingAway(false);		mKeyguardViewControllerLazy.get().setKeyguardGoingAwayState(false);
	mShowKeyguardWakeLock.release();		mShowKeyguardWakeLock.release();
	}		}
	mKeyguardDisplayManager.show();		mKeyguardDisplayManager.show();
	@@ -1901,7 +1898,7 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable {
	}		}

	mUpdateMonitor.setKeyguardGoingAway(true);		mUpdateMonitor.setKeyguardGoingAway(true);
	mNotificationShadeWindowController.setKeyguardGoingAway(true);		mKeyguardViewControllerLazy.get().setKeyguardGoingAwayState(true);

	// Don't actually hide the Keyguard at the moment, wait for window		// Don't actually hide the Keyguard at the moment, wait for window
	// manager until it tells us it's safe to do so with		// manager until it tells us it's safe to do so with

packages/SystemUI/src/com/android/systemui/keyguard/dagger/KeyguardModule.java

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -30,7 +30,6 @@ import com.android.systemui.keyguard.DismissCallbackRegistry;
	import com.android.systemui.keyguard.KeyguardViewMediator;		import com.android.systemui.keyguard.KeyguardViewMediator;
	import com.android.systemui.plugins.FalsingManager;		import com.android.systemui.plugins.FalsingManager;
	import com.android.systemui.statusbar.phone.NavigationModeController;		import com.android.systemui.statusbar.phone.NavigationModeController;
	import com.android.systemui.statusbar.phone.NotificationShadeWindowController;
	import com.android.systemui.statusbar.phone.StatusBar;		import com.android.systemui.statusbar.phone.StatusBar;
	import com.android.systemui.util.DeviceConfigProxy;		import com.android.systemui.util.DeviceConfigProxy;

	@@ -57,7 +56,6 @@ public class KeyguardModule {
	FalsingManager falsingManager,		FalsingManager falsingManager,
	LockPatternUtils lockPatternUtils,		LockPatternUtils lockPatternUtils,
	BroadcastDispatcher broadcastDispatcher,		BroadcastDispatcher broadcastDispatcher,
	NotificationShadeWindowController notificationShadeWindowController,
	Lazy<KeyguardViewController> statusBarKeyguardViewManagerLazy,		Lazy<KeyguardViewController> statusBarKeyguardViewManagerLazy,
	DismissCallbackRegistry dismissCallbackRegistry,		DismissCallbackRegistry dismissCallbackRegistry,
	KeyguardUpdateMonitor updateMonitor,		KeyguardUpdateMonitor updateMonitor,
	@@ -72,7 +70,6 @@ public class KeyguardModule {
	falsingManager,		falsingManager,
	lockPatternUtils,		lockPatternUtils,
	broadcastDispatcher,		broadcastDispatcher,
	notificationShadeWindowController,
	statusBarKeyguardViewManagerLazy,		statusBarKeyguardViewManagerLazy,
	dismissCallbackRegistry,		dismissCallbackRegistry,
	updateMonitor,		updateMonitor,

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

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -915,6 +915,11 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
	mStatusBar.keyguardGoingAway();		mStatusBar.keyguardGoingAway();
	}		}

			@Override
			public void setKeyguardGoingAwayState(boolean isKeyguardGoingAway) {
			mNotificationShadeWindowController.setKeyguardGoingAway(isKeyguardGoingAway);
			}

	@Override		@Override
	public void onCancelClicked() {		public void onCancelClicked() {
	// No-op		// No-op