Merge "Ensuring QS can't collapse (hide) in split shade" into tm-qpr-dev (898d6d91) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java

+12 −2

Original line number	Diff line number	Diff line
		@@ -2097,7 +2097,17 @@ public final class NotificationPanelViewController implements Dumpable {
		}
		}

		public void expandWithoutQs() {
		/**
		* Expand shade so that notifications are visible.
		* Non-split shade: just expanding shade or collapsing QS when they're expanded.
		* Split shade: only expanding shade, notifications are always visible
		*
		* Called when `adb shell cmd statusbar expand-notifications` is executed.
		*/
		public void expandShadeToNotifications() {
		if (mSplitShadeEnabled && (isShadeFullyOpen() \|\| isExpanding())) {
		return;
		}
		if (isQsExpanded()) {
		flingSettings(0 /* velocity */, FLING_COLLAPSE);
		} else {
		@@ -5536,7 +5546,7 @@ public final class NotificationPanelViewController implements Dumpable {

		@Override
		public void flingTopOverscroll(float velocity, boolean open) {
		// in split shade mode we want to expand/collapse QS only when touch happens within QS
		// in split shade touches affect QS only when touch happens within QS
		if (isSplitShadeAndTouchXOutsideQs(mInitialTouchX)) {
		return;
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -218,7 +218,7 @@ public class CentralSurfacesCommandQueueCallbacks implements CommandQueue.Callba
		return;
		}

		mNotificationPanelViewController.expandWithoutQs();
		mNotificationPanelViewController.expandShadeToNotifications();
		}

		@Override

+1 −1

Original line number	Diff line number	Diff line
		@@ -1147,7 +1147,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
		if (hideImmediately) {
		mStatusBarStateController.setLeaveOpenOnKeyguardHide(false);
		} else {
		mNotificationPanelViewController.expandWithoutQs();
		mNotificationPanelViewController.expandShadeToNotifications();
		}
		}
		return;

+2 −2

Original line number	Diff line number	Diff line
		@@ -147,7 +147,7 @@ public class CentralSurfacesCommandQueueCallbacksTest extends SysuiTestCase {

		// Trying to open it does nothing.
		mSbcqCallbacks.animateExpandNotificationsPanel();
		verify(mNotificationPanelViewController, never()).expandWithoutQs();
		verify(mNotificationPanelViewController, never()).expandShadeToNotifications();
		mSbcqCallbacks.animateExpandSettingsPanel(null);
		verify(mNotificationPanelViewController, never()).expand(anyBoolean());
		}
		@@ -165,7 +165,7 @@ public class CentralSurfacesCommandQueueCallbacksTest extends SysuiTestCase {

		// Can now be opened.
		mSbcqCallbacks.animateExpandNotificationsPanel();
		verify(mNotificationPanelViewController).expandWithoutQs();
		verify(mNotificationPanelViewController).expandShadeToNotifications();
		mSbcqCallbacks.animateExpandSettingsPanel(null);
		verify(mNotificationPanelViewController).expandWithQs();
		}