Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
TreeHugger Robot
2022-05-10 21:18:17 +00:00
committed by Automerger Merge Worker
parent b68a1a318f a246fe9a04
commit 9b1d768aa0
2 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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 */);

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

@@ -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();