Merge "Do not expand quick settings when shade first opens" into sc-dev am: 8b6cc5fd2e

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

Change-Id: Ibede5ef1f57b84f7090c17130f8af906b51cd57c
This commit is contained in:
Lyn Han
2021-06-05 05:21:07 +00:00
committed by Automerger Merge Worker

View File

@@ -2203,7 +2203,7 @@ public class NotificationPanelViewController extends PanelViewController {
final int qsPanelBottomY = calculateQsBottomPosition(computeQsExpansionFraction());
final boolean visible = (computeQsExpansionFraction() > 0 || qsPanelBottomY > 0)
&& !mShouldUseSplitNotificationShade;
setQsExpansionEnabled(mAmbientState.getScrollY() == 0);
setQsExpansionEnabled(mAmbientState.getScrollY() == 0 && !mAmbientState.isShadeOpening());
if (!mShouldUseSplitNotificationShade) {
if (mTransitioningToFullShadeProgress > 0.0f) {