Merge "Do not expand NPV when unoccluding with bouncer" into qt-dev (0e9667a3) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -484,7 +484,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
		// by a FLAG_DISMISS_KEYGUARD_ACTIVITY.
		reset(isOccluding /* hideBouncerWhenShowing*/);
		}
		if (animate && !occluded && mShowing) {
		if (animate && !occluded && mShowing && !mBouncer.isShowing()) {
		mStatusBar.animateKeyguardUnoccluding();
		}
		}

+12 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ package com.android.systemui.statusbar.phone;
		import static org.mockito.ArgumentMatchers.anyBoolean;
		import static org.mockito.ArgumentMatchers.anyFloat;
		import static org.mockito.ArgumentMatchers.eq;
		import static org.mockito.Mockito.clearInvocations;
		import static org.mockito.Mockito.mock;
		import static org.mockito.Mockito.never;
		import static org.mockito.Mockito.reset;
		@@ -196,6 +197,17 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase {
		verify(mBouncer, never()).setExpansion(anyFloat());
		}

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

		when(mBouncer.isShowing()).thenReturn(true);
		clearInvocations(mStatusBar);
		mStatusBarKeyguardViewManager.setOccluded(false /* occluded /, true / animated */);
		verify(mStatusBar, never()).animateKeyguardUnoccluding();
		}

		private class TestableStatusBarKeyguardViewManager extends StatusBarKeyguardViewManager {

		public TestableStatusBarKeyguardViewManager(Context context,