Merge "Change SBKVM to use notification shade window instead of status bar" (5e3516d6) · Commits · e / os / android_frameworks_base

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

+1 −7

Original line number	Original line	Diff line number	Diff line
	@@ -111,8 +111,6 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
	private final NavigationModeController mNavigationModeController;		private final NavigationModeController mNavigationModeController;
	private final NotificationShadeWindowController mNotificationShadeWindowController;		private final NotificationShadeWindowController mNotificationShadeWindowController;
	private final KeyguardBouncer.Factory mKeyguardBouncerFactory;		private final KeyguardBouncer.Factory mKeyguardBouncerFactory;
	private final WakefulnessLifecycle mWakefulnessLifecycle;
	private final UnlockedScreenOffAnimationController mUnlockedScreenOffAnimationController;
	private final KeyguardMessageAreaController.Factory mKeyguardMessageAreaFactory;		private final KeyguardMessageAreaController.Factory mKeyguardMessageAreaFactory;
	private KeyguardMessageAreaController mKeyguardMessageAreaController;		private KeyguardMessageAreaController mKeyguardMessageAreaController;
	private final Lazy<ShadeController> mShadeController;		private final Lazy<ShadeController> mShadeController;
	@@ -244,8 +242,6 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
	KeyguardStateController keyguardStateController,		KeyguardStateController keyguardStateController,
	NotificationMediaManager notificationMediaManager,		NotificationMediaManager notificationMediaManager,
	KeyguardBouncer.Factory keyguardBouncerFactory,		KeyguardBouncer.Factory keyguardBouncerFactory,
	WakefulnessLifecycle wakefulnessLifecycle,
	UnlockedScreenOffAnimationController unlockedScreenOffAnimationController,
	KeyguardMessageAreaController.Factory keyguardMessageAreaFactory,		KeyguardMessageAreaController.Factory keyguardMessageAreaFactory,
	Lazy<ShadeController> shadeController) {		Lazy<ShadeController> shadeController) {
	mContext = context;		mContext = context;
	@@ -260,8 +256,6 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
	mStatusBarStateController = sysuiStatusBarStateController;		mStatusBarStateController = sysuiStatusBarStateController;
	mDockManager = dockManager;		mDockManager = dockManager;
	mKeyguardBouncerFactory = keyguardBouncerFactory;		mKeyguardBouncerFactory = keyguardBouncerFactory;
	mWakefulnessLifecycle = wakefulnessLifecycle;
	mUnlockedScreenOffAnimationController = unlockedScreenOffAnimationController;
	mKeyguardMessageAreaFactory = keyguardMessageAreaFactory;		mKeyguardMessageAreaFactory = keyguardMessageAreaFactory;
	mShadeController = shadeController;		mShadeController = shadeController;
	}		}
	@@ -1155,7 +1149,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb

	@Override		@Override
	public ViewRootImpl getViewRootImpl() {		public ViewRootImpl getViewRootImpl() {
	return mStatusBar.getStatusBarView().getViewRootImpl();		return mNotificationShadeWindowController.getNotificationShadeView().getViewRootImpl();
	}		}

	public void launchPendingWakeupAction() {		public void launchPendingWakeupAction() {

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManagerTest.java

+3 −17

Original line number	Original line	Diff line number	Diff line
	@@ -43,9 +43,6 @@ import com.android.keyguard.KeyguardUpdateMonitor;
	import com.android.keyguard.ViewMediatorCallback;		import com.android.keyguard.ViewMediatorCallback;
	import com.android.systemui.SysuiTestCase;		import com.android.systemui.SysuiTestCase;
	import com.android.systemui.dock.DockManager;		import com.android.systemui.dock.DockManager;
	import com.android.systemui.dump.DumpManager;
	import com.android.systemui.keyguard.DismissCallbackRegistry;
	import com.android.systemui.keyguard.WakefulnessLifecycle;
	import com.android.systemui.navigationbar.NavigationModeController;		import com.android.systemui.navigationbar.NavigationModeController;
	import com.android.systemui.plugins.ActivityStarter.OnDismissAction;		import com.android.systemui.plugins.ActivityStarter.OnDismissAction;
	import com.android.systemui.statusbar.NotificationMediaManager;		import com.android.systemui.statusbar.NotificationMediaManager;
	@@ -79,9 +76,7 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase {
	@Mock		@Mock
	private NotificationPanelViewController mNotificationPanelView;		private NotificationPanelViewController mNotificationPanelView;
	@Mock		@Mock
	private BiometricUnlockController mBiometrucUnlockController;		private BiometricUnlockController mBiometricUnlockController;
	@Mock
	private DismissCallbackRegistry mDismissCallbackRegistry;
	@Mock		@Mock
	private SysuiStatusBarStateController mStatusBarStateController;		private SysuiStatusBarStateController mStatusBarStateController;
	@Mock		@Mock
	@@ -97,15 +92,12 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase {
	@Mock		@Mock
	private KeyguardBouncer mBouncer;		private KeyguardBouncer mBouncer;
	@Mock		@Mock
	private UnlockedScreenOffAnimationController mUnlockedScreenOffAnimationController;
	@Mock
	private StatusBarKeyguardViewManager.AlternateAuthInterceptor mAlternateAuthInterceptor;		private StatusBarKeyguardViewManager.AlternateAuthInterceptor mAlternateAuthInterceptor;
	@Mock		@Mock
	private KeyguardMessageArea mKeyguardMessageArea;		private KeyguardMessageArea mKeyguardMessageArea;
	@Mock		@Mock
	private ShadeController mShadeController;		private ShadeController mShadeController;

	private WakefulnessLifecycle mWakefulnessLifecycle;
	private StatusBarKeyguardViewManager mStatusBarKeyguardViewManager;		private StatusBarKeyguardViewManager mStatusBarKeyguardViewManager;

	@Before		@Before
	@@ -117,10 +109,6 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase {
	.thenReturn(mBouncer);		.thenReturn(mBouncer);
	when(mStatusBar.getBouncerContainer()).thenReturn(mContainer);		when(mStatusBar.getBouncerContainer()).thenReturn(mContainer);
	when(mContainer.findViewById(anyInt())).thenReturn(mKeyguardMessageArea);		when(mContainer.findViewById(anyInt())).thenReturn(mKeyguardMessageArea);
	mWakefulnessLifecycle = new WakefulnessLifecycle(
	getContext(),
	null,
	mock(DumpManager.class));
	mStatusBarKeyguardViewManager = new StatusBarKeyguardViewManager(		mStatusBarKeyguardViewManager = new StatusBarKeyguardViewManager(
	getContext(),		getContext(),
	mViewMediatorCallback,		mViewMediatorCallback,
	@@ -134,15 +122,13 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase {
	mKeyguardStateController,		mKeyguardStateController,
	mock(NotificationMediaManager.class),		mock(NotificationMediaManager.class),
	mKeyguardBouncerFactory,		mKeyguardBouncerFactory,
	mWakefulnessLifecycle,
	mUnlockedScreenOffAnimationController,
	mKeyguardMessageAreaFactory,		mKeyguardMessageAreaFactory,
	() -> mShadeController);		() -> mShadeController);
	mStatusBarKeyguardViewManager.registerStatusBar(		mStatusBarKeyguardViewManager.registerStatusBar(
	mStatusBar,		mStatusBar,
	mNotificationPanelView,		mNotificationPanelView,
	new PanelExpansionStateManager(),		new PanelExpansionStateManager(),
	mBiometrucUnlockController,		mBiometricUnlockController,
	mNotificationContainer,		mNotificationContainer,
	mBypassController);		mBypassController);
	mStatusBarKeyguardViewManager.show(null);		mStatusBarKeyguardViewManager.show(null);
	@@ -261,7 +247,7 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase {

	@Test		@Test
	public void onPanelExpansionChanged_neverTranslatesBouncerWhenWakeAndUnlock() {		public void onPanelExpansionChanged_neverTranslatesBouncerWhenWakeAndUnlock() {
	when(mBiometrucUnlockController.getMode())		when(mBiometricUnlockController.getMode())
	.thenReturn(BiometricUnlockController.MODE_WAKE_AND_UNLOCK);		.thenReturn(BiometricUnlockController.MODE_WAKE_AND_UNLOCK);
	mStatusBarKeyguardViewManager.onPanelExpansionChanged(		mStatusBarKeyguardViewManager.onPanelExpansionChanged(
	/* fraction= */ KeyguardBouncer.EXPANSION_VISIBLE,		/* fraction= */ KeyguardBouncer.EXPANSION_VISIBLE,