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

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

Change-Id: I82338bacd1f384e46b1a3dbc52ccd602fd6de713
This commit is contained in:
Lyn Han
2021-07-02 21:44:42 +00:00
committed by Automerger Merge Worker

View File

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