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

Merge "Fixing SysUI reporting expanded split shade state to launcher" into tm-qpr-dev am: 625756bee7

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

Change-Id: I8f604d1f4c8a806aa0e27506e0574b9a1b447ecf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Michał Brzeziński
2022-10-31 16:55:00 +00:00
committed by Automerger Merge Worker
parent de6b93bd14 625756bee7
commit d3b131a374
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java
View File

@@ -5035,7 +5035,7 @@ public final class NotificationPanelViewController {
} }
public boolean isFullyExpanded() { public boolean isFullyExpanded() {
return mExpandedHeight >= getMaxPanelHeight(); return mExpandedHeight >= getMaxPanelTransitionDistance();
} }
public boolean isFullyCollapsed() { public boolean isFullyCollapsed() {

9
packages/SystemUI/tests/src/com/android/systemui/shade/NotificationPanelViewControllerTest.java
View File

@@ -1680,6 +1680,15 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase {
inOrder.verify(mNotificationStackScrollLayoutController).onExpansionStopped(); inOrder.verify(mNotificationStackScrollLayoutController).onExpansionStopped();
} }
@Test
public void inUnlockedSplitShade_transitioningMaxTransitionDistance_makesShadeFullyExpanded() {
mStatusBarStateController.setState(SHADE);
enableSplitShade(true);
int transitionDistance = mNotificationPanelViewController.getMaxPanelTransitionDistance();
mNotificationPanelViewController.setExpandedHeight(transitionDistance);
assertThat(mNotificationPanelViewController.isFullyExpanded()).isTrue();
}
private static MotionEvent createMotionEvent(int x, int y, int action) { private static MotionEvent createMotionEvent(int x, int y, int action) {
return MotionEvent.obtain( return MotionEvent.obtain(
/* downTime= */ 0, /* eventTime= */ 0, action, x, y, /* metaState= */ 0); /* downTime= */ 0, /* eventTime= */ 0, action, x, y, /* metaState= */ 0);