Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1fe78c6a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Don't expand shade when pulsing w/o tracking notif" into tm-dev

parents c46b5540 97834b3c

packages/SystemUI/src/com/android/systemui/statusbar/LockscreenShadeTransitionController.kt

+1 −1
Original line number Original line Diff line number Diff line
@@ -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.row.ExpandableView

import com.android.systemui.statusbar.notification.stack.AmbientState

import com.android.systemui.statusbar.notification.stack.AmbientState

import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayoutController

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.KeyguardBypassController

import com.android.systemui.statusbar.phone.LSShadeTransitionLogger

import com.android.systemui.statusbar.phone.LSShadeTransitionLogger

import com.android.systemui.statusbar.phone.NotificationPanelViewController

import com.android.systemui.statusbar.phone.NotificationPanelViewController

import com.android.systemui.statusbar.phone.ScrimController

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.statusbar.policy.ConfigurationController

import com.android.systemui.util.Utils

import com.android.systemui.util.Utils

import java.io.FileDescriptor

import java.io.FileDescriptor

packages/SystemUI/src/com/android/systemui/statusbar/PulseExpansionHandler.kt

+4 −1
Original line number Original line Diff line number Diff line
@@ -192,7 +192,10 @@ constructor( 
    override fun onTouchEvent(event: MotionEvent): Boolean {

    override fun onTouchEvent(event: MotionEvent): Boolean {

        val finishExpanding = (event.action == MotionEvent.ACTION_CANCEL ||

        val finishExpanding = (event.action == MotionEvent.ACTION_CANCEL ||

            event.action == MotionEvent.ACTION_UP) && isExpanding

            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

            // We allow cancellations/finishing to still go through here to clean up the state

            return false

            return false

        }

        }