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

Merge "Don't pass QS expand state to NPVC in split shade mode." into sc-v2-dev am: 39b2871635

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

Change-Id: I21319c81fc7ac1ce21c12a25940d8919d9a689b8
This commit is contained in:
TreeHugger Robot
2021-11-11 12:38:22 +00:00
committed by Automerger Merge Worker
parent c5b3558391 39b2871635
commit 7a63d8e0cd
1 changed files with 8 additions and 2 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

@@ -2206,7 +2206,7 @@ public class NotificationPanelViewController extends PanelViewController {
mQs.setExpanded(mQsExpanded); mQs.setExpanded(mQsExpanded);
} }
private void setQsExpansion(float height) { void setQsExpansion(float height) {
height = Math.min(Math.max(height, mQsMinExpansionHeight), mQsMaxExpansionHeight); height = Math.min(Math.max(height, mQsMinExpansionHeight), mQsMaxExpansionHeight);
mQsFullyExpanded = height == mQsMaxExpansionHeight && mQsMaxExpansionHeight != 0; mQsFullyExpanded = height == mQsMaxExpansionHeight && mQsMaxExpansionHeight != 0;
if (height > mQsMinExpansionHeight && !mQsExpanded && !mStackScrollerOverscrolling if (height > mQsMinExpansionHeight && !mQsExpanded && !mStackScrollerOverscrolling
@@ -2250,7 +2250,13 @@ public class NotificationPanelViewController extends PanelViewController {
int qsPanelBottomY = calculateQsBottomPosition(qsExpansionFraction); int qsPanelBottomY = calculateQsBottomPosition(qsExpansionFraction);
mScrimController.setQsPosition(qsExpansionFraction, qsPanelBottomY); mScrimController.setQsPosition(qsExpansionFraction, qsPanelBottomY);
setQSClippingBounds(); setQSClippingBounds();
mNotificationStackScrollLayoutController.setQsExpansionFraction(qsExpansionFraction);
// Only need to notify the notification stack when we're not in split screen mode. If we
// do, then the notification panel starts scrolling along with the QS.
if (!mShouldUseSplitNotificationShade) {
mNotificationStackScrollLayoutController.setQsExpansionFraction(qsExpansionFraction);
}
mDepthController.setQsPanelExpansion(qsExpansionFraction); mDepthController.setQsPanelExpansion(qsExpansionFraction);
} }