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

Merge "Fixing QS expanding in split shade when swipe happens on notifications" into sc-dev am: f251391e69

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

Change-Id: Ic918be32c82845c09c04f0e7897ff239eb74b975
This commit is contained in:
Michał Brzeziński
2021-05-04 14:49:43 +00:00
committed by Automerger Merge Worker
parent 84f0f0f972 f251391e69
commit 55f111e2b2
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3708,6 +3708,12 @@ public class NotificationPanelViewController extends PanelViewController {
@Override @Override
public void flingTopOverscroll(float velocity, boolean open) { public void flingTopOverscroll(float velocity, boolean open) {
// in split shade mode we want to expand/collapse QS only when touch happens within QS
if (mShouldUseSplitNotificationShade
&& (mInitialTouchX < mQsFrame.getX()
|| mInitialTouchX > mQsFrame.getX() + mQsFrame.getWidth())) {
return;
}
mLastOverscroll = 0f; mLastOverscroll = 0f;
mQsExpansionFromOverscroll = false; mQsExpansionFromOverscroll = false;
setQsExpansion(mQsExpansionHeight); setQsExpansion(mQsExpansionHeight);