Merge "Swipe-up from SHADE_LOCKED goes to LS (instead of the bouncer)" into tm-qpr-dev (bc54ade5) · Commits · e / os / android_frameworks_base

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

+3 −5

Original line number	Diff line number	Diff line
		@@ -3313,14 +3313,12 @@ public class CentralSurfacesImpl extends CoreStartable implements
		// show the bouncer/lockscreen.
		if (!mKeyguardViewMediator.isHiding()
		&& !mKeyguardUnlockAnimationController.isPlayingCannedUnlockAnimation()) {
		if (mState == StatusBarState.SHADE_LOCKED
		&& mKeyguardUpdateMonitor.isUdfpsEnrolled()) {
		if (mState == StatusBarState.SHADE_LOCKED) {
		// shade is showing while locked on the keyguard, so go back to showing the
		// lock screen where users can use the UDFPS affordance to enter the device
		mStatusBarKeyguardViewManager.reset(true);
		} else if ((mState == StatusBarState.KEYGUARD
		&& !mStatusBarKeyguardViewManager.bouncerIsOrWillBeShowing())
		\|\| mState == StatusBarState.SHADE_LOCKED) {
		} else if (mState == StatusBarState.KEYGUARD
		&& !mStatusBarKeyguardViewManager.bouncerIsOrWillBeShowing()) {
		mStatusBarKeyguardViewManager.showGenericBouncer(true /* scrimmed */);
		}
		}

+2 −4

Original line number	Diff line number	Diff line
		@@ -378,11 +378,9 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
		return;
		} else if (mNotificationPanelViewController.isUnlockHintRunning()) {
		mBouncer.setExpansion(KeyguardBouncer.EXPANSION_HIDDEN);
		} else if (mStatusBarStateController.getState() == StatusBarState.SHADE_LOCKED
		&& mKeyguardUpdateManager.isUdfpsEnrolled()) {
		} else if (mStatusBarStateController.getState() == StatusBarState.SHADE_LOCKED) {
		// Don't expand to the bouncer. Instead transition back to the lock screen (see
		// CentralSurfaces#showBouncerOrLockScreenIfKeyguard) where the user can use the UDFPS
		// affordance to enter the device (or swipe up to the input bouncer)
		// CentralSurfaces#showBouncerOrLockScreenIfKeyguard)
		return;
		} else if (bouncerNeedsScrimming()) {
		mBouncer.setExpansion(KeyguardBouncer.EXPANSION_VISIBLE);

+12 −0

Original line number	Diff line number	Diff line
		@@ -51,6 +51,7 @@ import com.android.systemui.shade.NotificationPanelViewController;
		import com.android.systemui.shade.ShadeController;
		import com.android.systemui.statusbar.NotificationMediaManager;
		import com.android.systemui.statusbar.NotificationShadeWindowController;
		import com.android.systemui.statusbar.StatusBarState;
		import com.android.systemui.statusbar.SysuiStatusBarStateController;
		import com.android.systemui.statusbar.phone.panelstate.PanelExpansionChangeEvent;
		import com.android.systemui.statusbar.phone.panelstate.PanelExpansionStateManager;
		@@ -276,6 +277,17 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase {
		verify(mBouncer, never()).setExpansion(anyFloat());
		}

		@Test
		public void onPanelExpansionChanged_neverTranslatesBouncerWhenShadeLocked() {
		when(mStatusBarStateController.getState()).thenReturn(StatusBarState.SHADE_LOCKED);
		mStatusBarKeyguardViewManager.onPanelExpansionChanged(
		expansionEvent(
		/* fraction= */ KeyguardBouncer.EXPANSION_VISIBLE,
		/* expanded= */ true,
		/* tracking= */ false));
		verify(mBouncer, never()).setExpansion(anyFloat());
		}

		@Test
		public void setOccluded_animatesPanelExpansion_onlyIfBouncerHidden() {
		mStatusBarKeyguardViewManager.setOccluded(false /* occluded /, true / animated */);