From 265518c7b0960e523ad5ca85ca657ce4aea17f83 Mon Sep 17 00:00:00 2001 From: Michal Brzezinski Date: Mon, 13 Sep 2021 15:29:52 +0100 Subject: [PATCH] Fixing customizer scroll in collapsed split shade "mQsFullyExpanded" in the check "mQsFullyExpanded && mQs.disallowPanelTouches()" is redundant as disallowPanelTouches() really checks if customizer or tile detail are visible. Normally, they can be visible only when QS is expanded. The only exception is split shade, when both customizer and detail can be visible without expanding QS and in that case requiring "mQsFullyExpanded" to be true is incorrect condition, that's why it should be removed. Bug: 196805282 Test: expand split shade but don't expand QS -> click "edit tiles" button -> try to scroll tiles Change-Id: Ifb5fb792e0580bdf2533b3e04afc233e3eb4c27b --- .../statusbar/phone/NotificationPanelViewController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java index 198ad98b8a376..cae85ce103582 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java @@ -3760,7 +3760,7 @@ public class NotificationPanelViewController extends PanelViewController { return new TouchHandler() { @Override public boolean onInterceptTouchEvent(MotionEvent event) { - if (mBlockTouches || mQsFullyExpanded && mQs.disallowPanelTouches()) { + if (mBlockTouches || mQs.disallowPanelTouches()) { return false; } initDownStates(event);