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

Merge "Fix screen off after panel expansion" into tm-dev am: 659341ffd4

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

Change-Id: I88b967f0c4b23b0a2012cd2ad580f625823e4b0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Matt Pietal
2022-05-18 21:45:57 +00:00
committed by Automerger Merge Worker
parent 3134e4cdea 659341ffd4
commit 593ac0005a
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3038,10 +3038,11 @@ public class NotificationPanelViewController extends PanelViewController {
private void updatePanelExpanded() { private void updatePanelExpanded() {
boolean isExpanded = !isFullyCollapsed() || mExpectingSynthesizedDown; boolean isExpanded = !isFullyCollapsed() || mExpectingSynthesizedDown;
if (mPanelExpanded != isExpanded) { if (mPanelExpanded != isExpanded) {
mPanelExpanded = isExpanded;
mHeadsUpManager.setIsPanelExpanded(isExpanded); mHeadsUpManager.setIsPanelExpanded(isExpanded);
mStatusBarTouchableRegionManager.setPanelExpanded(isExpanded); mStatusBarTouchableRegionManager.setPanelExpanded(isExpanded);
mCentralSurfaces.setPanelExpanded(isExpanded); mCentralSurfaces.setPanelExpanded(isExpanded);
mPanelExpanded = isExpanded;
if (!isExpanded && mQs != null && mQs.isCustomizing()) { if (!isExpanded && mQs != null && mQs.isCustomizing()) {
mQs.closeCustomizer(); mQs.closeCustomizer();
@@ -3049,6 +3050,10 @@ public class NotificationPanelViewController extends PanelViewController {
} }
} }
boolean isPanelExpanded() {
return mPanelExpanded;
}
private int calculatePanelHeightShade() { private int calculatePanelHeightShade() {
final int maxHeight = mNotificationStackScrollLayoutController.getHeight(); final int maxHeight = mNotificationStackScrollLayoutController.getHeight();
if (mBarState == KEYGUARD) { if (mBarState == KEYGUARD) {

2
packages/SystemUI/src/com/android/systemui/statusbar/phone/UnlockedScreenOffAnimationController.kt
View File

@@ -313,7 +313,7 @@ class UnlockedScreenOffAnimationController @Inject constructor(
// already expanded and showing notifications/QS, the animation looks really messy. For now, // already expanded and showing notifications/QS, the animation looks really messy. For now,
// disable it if the notification panel is expanded. // disable it if the notification panel is expanded.
if ((!this::mCentralSurfaces.isInitialized || if ((!this::mCentralSurfaces.isInitialized ||
mCentralSurfaces.notificationPanelViewController.isExpanded) && mCentralSurfaces.notificationPanelViewController.isPanelExpanded) &&
// Status bar might be expanded because we have started // Status bar might be expanded because we have started
// playing the animation already // playing the animation already
!isAnimationPlaying() !isAnimationPlaying()