Merge "Enable qs open while shade expansion is still running" into sc-v2-dev am: ef459ac0b8

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

Change-Id: Ie7c225231f0771a55daf58896ffb03c1ee490bb4
This commit is contained in:
Lyn Han
2021-07-02 21:40:29 +00:00
committed by Automerger Merge Worker

View File

@@ -2286,8 +2286,7 @@ public class NotificationPanelViewController extends PanelViewController {
private void updateQSExpansionEnabledAmbient() { private void updateQSExpansionEnabledAmbient() {
final float scrollRangeToTop = mAmbientState.getTopPadding() - mQuickQsOffsetHeight; final float scrollRangeToTop = mAmbientState.getTopPadding() - mQuickQsOffsetHeight;
mQsExpansionEnabledAmbient = mShouldUseSplitNotificationShade mQsExpansionEnabledAmbient = mShouldUseSplitNotificationShade
|| (mAmbientState.getScrollY() <= scrollRangeToTop || (mAmbientState.getScrollY() <= scrollRangeToTop);
&& !mAmbientState.isShadeOpening());
setQsExpansionEnabled(); setQsExpansionEnabled();
} }