Merge "Don't pass QS expand state to NPVC in split shade mode." into sc-v2-dev am: 39b2871635
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16063815 Change-Id: I21319c81fc7ac1ce21c12a25940d8919d9a689b8
This commit is contained in:
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user