Enable QS open while notifications are scrolled below status bar

Fixes: 190196495
Test: swipe down from qs with notifs scrolled and partially
      covering qs => qs opens to fullscreen, notifs pushed down
                     offscreen with scrollY reset to 0
Change-Id: I3c1f92b71457b9cee854647b5011424f6ee2659f
This commit is contained in:
Lyn Han
2021-06-10 19:13:25 -05:00
parent 49be55d145
commit 7ff423028a
2 changed files with 8 additions and 1 deletions

View File

@@ -4550,6 +4550,12 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
@ShadeViewRefactor(RefactorComponent.SHADE_VIEW)
public void setQsExpansionFraction(float qsExpansionFraction) {
mQsExpansionFraction = qsExpansionFraction;
// If notifications are scrolled,
// clear out scrollY by the time we push notifications offscreen
if (mOwnScrollY > 0) {
setOwnScrollY((int) MathUtils.lerp(mOwnScrollY, 0, mQsExpansionFraction));
}
}
@ShadeViewRefactor(RefactorComponent.COORDINATOR)

View File

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