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

Don't expand shade when pulsing w/o tracking notif

Browse Source 
When pulsing, we only allow dragging down anywhere to expand
the shade when the keyguard can be bypassed. Else, the user
needs to drag the notification itself to expansion.

Why? Devices with UDFPS can wakeup the display to the pulsing
state without notifications. In this state, users shouldn't be
able to swipe to expand the notification shade while pulsing.

Test: atest SystemUITests
Fixes: 217247200
Change-Id: Ieb6bf058bac95a4e7259703d1e87e99f910b40c8
This commit is contained in:
Beverly
2022-03-15 20:17:53 +00:00
parent b78bf4e4d7
commit 97834b3c30
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/statusbar/LockscreenShadeTransitionController.kt
View File

@@ -34,11 +34,11 @@ import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow
import com.android.systemui.statusbar.notification.row.ExpandableView
import com.android.systemui.statusbar.notification.stack.AmbientState
import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayoutController
import com.android.systemui.statusbar.phone.CentralSurfaces
import com.android.systemui.statusbar.phone.KeyguardBypassController
import com.android.systemui.statusbar.phone.LSShadeTransitionLogger
import com.android.systemui.statusbar.phone.NotificationPanelViewController
import com.android.systemui.statusbar.phone.ScrimController
import com.android.systemui.statusbar.phone.CentralSurfaces
import com.android.systemui.statusbar.policy.ConfigurationController
import com.android.systemui.util.Utils
import java.io.FileDescriptor

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

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