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

Commit 9b1d768a authored May 10, 2022 by TreeHugger Robot Committed by Automerger Merge Worker May 10, 2022

Merge "Fixing "adb shell cmd statusbar expand-settings" command in split...

Merge "Fixing "adb shell cmd statusbar expand-settings" command in split shade" into tm-dev am: 8b644eff am: a246fe9a

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18140153

Change-Id: I8c28bf01a11ea7547580efd19990a2b6358360b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents b68a1a31 a246fe9a

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

+9 −1

Original line number	Diff line number	Diff line
		@@ -1690,7 +1690,15 @@ public class NotificationPanelViewController extends PanelViewController {
		mQsExpandImmediate = true;
		setShowShelfOnly(true);
		}
		if (isFullyCollapsed()) {
		if (mShouldUseSplitNotificationShade && isOnKeyguard()) {
		// It's a special case as this method is likely to not be initiated by finger movement
		// but rather called from adb shell or accessibility service.
		// In the future method below could be used for non-split shade as well but currently
		// motion in that case looks worse than using flingSettings.
		// TODO: make below function transitioning smoothly also in portrait with empty target
		mLockscreenShadeTransitionController.goToLockedShade(
		/* expandedView= /null, / needsQSAnimation= */false);
		} else if (isFullyCollapsed()) {
		expand(true /* animate */);
		} else {
		traceQsJank(true /* startTracing /, false / wasCancelled */);

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

+11 −0

Original line number	Diff line number	Diff line
		@@ -1008,6 +1008,17 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase {
		verify(mLargeScreenShadeHeaderController).setActive(false);
		}

		@Test
		public void testExpandWithQsMethodIsUsingLockscreenTransitionController() {
		enableSplitShade(/* enabled= */ true);
		mStatusBarStateController.setState(KEYGUARD);

		mNotificationPanelViewController.expandWithQs();

		verify(mLockscreenShadeTransitionController).goToLockedShade(
		/* expandedView= /null, / needsQSAnimation= */false);
		}

		@Test
		public void testUnlockAnimationDoesNotAffectScrim() {
		mNotificationPanelViewController.onUnlockHintStarted();