Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aaac2cb5 authored Jun 08, 2018 by Lucas Dupin

Avoid showing bouncer when in a launch transition

The panel will collapse but the bouncer should not become visible,
otherwise the IME might be requested.

Test: go/sysui-bouncer-tests
Test: atest packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManagerTest.java
Change-Id: I0405cf1b956aa239b0684ac357a38cf4b2357cb2
Fixes: 109879604

parent e9922a88

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -174,7 +174,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
	\|\| mStatusBar.isFullScreenUserSwitcherState()) {		\|\| mStatusBar.isFullScreenUserSwitcherState()) {
	mBouncer.setExpansion(KeyguardBouncer.EXPANSION_VISIBLE);		mBouncer.setExpansion(KeyguardBouncer.EXPANSION_VISIBLE);
	} else if (mShowing && !mDozing) {		} else if (mShowing && !mDozing) {
	if (!isWakeAndUnlocking()) {		if (!isWakeAndUnlocking() && !mStatusBar.isInLaunchTransition()) {
	mBouncer.setExpansion(expansion);		mBouncer.setExpansion(expansion);
	}		}
	if (expansion != KeyguardBouncer.EXPANSION_HIDDEN && tracking		if (expansion != KeyguardBouncer.EXPANSION_HIDDEN && tracking

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

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -177,6 +177,14 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase {
	verify(mBouncer, never()).setExpansion(anyFloat());		verify(mBouncer, never()).setExpansion(anyFloat());
	}		}

			@Test
			public void onPanelExpansionChanged_neverTranslatesBouncerWhenLaunchingApp() {
			when(mStatusBar.isInLaunchTransition()).thenReturn(true);
			mStatusBarKeyguardViewManager.onPanelExpansionChanged(KeyguardBouncer.EXPANSION_VISIBLE,
			false /* tracking */);
			verify(mBouncer, never()).setExpansion(anyFloat());
			}

	private class TestableStatusBarKeyguardViewManager extends StatusBarKeyguardViewManager {		private class TestableStatusBarKeyguardViewManager extends StatusBarKeyguardViewManager {

	public TestableStatusBarKeyguardViewManager(Context context,		public TestableStatusBarKeyguardViewManager(Context context,