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

Browse Source
This commit is contained in:
TreeHugger Robot
2021-11-11 12:19:47 +00:00
committed by Android (Google) Code Review
parent 8eb5761cfd 65e6cbe685
commit 39b2871635
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);
}
private void setQsExpansion(float height) {
void setQsExpansion(float height) {
height = Math.min(Math.max(height, mQsMinExpansionHeight), mQsMaxExpansionHeight);
mQsFullyExpanded = height == mQsMaxExpansionHeight && mQsMaxExpansionHeight != 0;
if (height > mQsMinExpansionHeight && !mQsExpanded && !mStackScrollerOverscrolling
@@ -2250,7 +2250,13 @@ public class NotificationPanelViewController extends PanelViewController {
int qsPanelBottomY = calculateQsBottomPosition(qsExpansionFraction);
mScrimController.setQsPosition(qsExpansionFraction, qsPanelBottomY);
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);
}