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

Merge "Fixing shade not collapsing after rotating from split shade" into udc-dev am: 9ade6c3076

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

Change-Id: I8c743f5fbd8794e646470042d83962c7033ddab1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Michał Brzeziński
2023-06-02 12:33:54 +00:00
committed by Automerger Merge Worker
parent 01e494d27e 9ade6c3076
commit 66244229db
2 changed files with 9 additions and 0 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

@@ -2011,6 +2011,8 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump
} }
updateExpansionAndVisibility(); updateExpansionAndVisibility();
mNotificationStackScrollLayoutController.setPanelFlinging(false); mNotificationStackScrollLayoutController.setPanelFlinging(false);
// expandImmediate should be always reset at the end of animation
mQsController.setExpandImmediate(false);
} }
private boolean isInContentBounds(float x, float y) { private boolean isInContentBounds(float x, float y) {

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

@@ -1096,6 +1096,13 @@ public class NotificationPanelViewControllerTest extends NotificationPanelViewCo
inOrder.verify(mNotificationStackScrollLayoutController).onExpansionStopped(); inOrder.verify(mNotificationStackScrollLayoutController).onExpansionStopped();
} }
@Test
public void onShadeFlingEnd_mExpandImmediateShouldBeReset() {
mNotificationPanelViewController.onFlingEnd(false);
verify(mQsController).setExpandImmediate(false);
}
@Test @Test
public void inUnlockedSplitShade_transitioningMaxTransitionDistance_makesShadeFullyExpanded() { public void inUnlockedSplitShade_transitioningMaxTransitionDistance_makesShadeFullyExpanded() {
mStatusBarStateController.setState(SHADE); mStatusBarStateController.setState(SHADE);