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

Merge "Fixed an issue where the phone would be stuck pulseExpanding" into sc-dev

Browse Source
This commit is contained in:
Selim Cinek
2021-06-29 17:43:59 +00:00
committed by Android (Google) Code Review
parent 8a57c76a35 dea4663fae
commit 17a6678d78
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SystemUI/src/com/android/systemui/statusbar/PulseExpansionHandler.kt
View File

@@ -179,7 +179,10 @@ constructor(
} }
override fun onTouchEvent(event: MotionEvent): Boolean { override fun onTouchEvent(event: MotionEvent): Boolean {
if (!canHandleMotionEvent()) { val finishExpanding = (event.action == MotionEvent.ACTION_CANCEL ||
event.action == MotionEvent.ACTION_UP) && isExpanding
if (!canHandleMotionEvent() && !finishExpanding) {
// We allow cancellations/finishing to still go through here to clean up the state
return false return false
} }

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

@@ -3840,8 +3840,13 @@ public class NotificationPanelViewController extends PanelViewController {
expand(true /* animate */); expand(true /* animate */);
} }
initDownStates(event); initDownStates(event);
if (!mIsExpanding && !shouldQuickSettingsIntercept(mDownX, mDownY, 0)
&& mPulseExpansionHandler.onTouchEvent(event)) { // If pulse is expanding already, let's give it the touch. There are situations
// where the panel starts expanding even though we're also pulsing
boolean pulseShouldGetTouch = (!mIsExpanding
&& !shouldQuickSettingsIntercept(mDownX, mDownY, 0))
|| mPulseExpansionHandler.isExpanding();
if (pulseShouldGetTouch && mPulseExpansionHandler.onTouchEvent(event)) {
// We're expanding all the other ones shouldn't get this anymore // We're expanding all the other ones shouldn't get this anymore
return true; return true;
} }