Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Enable QS open while notifications are scrolled below status bar" into sc-dev

Browse Source
This commit is contained in:
Lyn Han
2021-06-15 16:05:21 +00:00
committed by Android (Google) Code Review
parent b6afc7575c 7ff423028a
commit bc014c2d3d
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java
View File

@@ -4550,6 +4550,12 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
@ShadeViewRefactor(RefactorComponent.SHADE_VIEW) @ShadeViewRefactor(RefactorComponent.SHADE_VIEW)
public void setQsExpansionFraction(float qsExpansionFraction) { public void setQsExpansionFraction(float qsExpansionFraction) {
mQsExpansionFraction = 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) @ShadeViewRefactor(RefactorComponent.COORDINATOR)

3
packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java
View File

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