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

Commit da0eb1fa authored by Joshua Trask's avatar Joshua Trask
Browse files

[Screenshot] Extend timeout on user interaction 

Bug: 332406583
Test: manual interactions w/ extra instrumentation
Flag: ACONFIG com.android.systemui.screenshot_shelf_ui DEVELOPMENT
Change-Id: I5eb27a2529803bfc533f9ab277c0b694b38c8a64
parent 8bd6d5d6

packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotShelfViewProxy.kt

+2 −1
Original line number Diff line number Diff line
@@ -85,7 +85,8 @@ constructor( 
            viewModel,

            LayoutInflater.from(context),

            onDismissalRequested = { event, velocity -> requestDismissal(event, velocity) },

            onDismissalCancelled = { animationController.getSwipeReturnAnimation().start() }

            onDismissalCancelled = { animationController.getSwipeReturnAnimation().start() },

            onUserInteraction = { callbacks?.onUserInteraction() }

        )

        view.updateInsets(windowManager.currentWindowMetrics.windowInsets)

        addPredictiveBackListener { requestDismissal(SCREENSHOT_DISMISSED_OTHER) }

packages/SystemUI/src/com/android/systemui/screenshot/ui/ScreenshotShelfView.kt

+16 −0
Original line number Diff line number Diff line
@@ -38,11 +38,20 @@ class ScreenshotShelfView(context: Context, attrs: AttributeSet? = null) : 
    private lateinit var screenshotStatic: ViewGroup

    var onTouchInterceptListener: ((MotionEvent) -> Boolean)? = null



    var userInteractionCallback: (() -> Unit)? = null



    private val displayMetrics = context.resources.displayMetrics

    private val tmpRect = Rect()

    private lateinit var actionsContainerBackground: View

    private lateinit var dismissButton: View



    init {

        setOnTouchListener({ _: View, _: MotionEvent ->

            userInteractionCallback?.invoke()

            true

        })

    }



    override fun onFinishInflate() {

        super.onFinishInflate()

        // Get focus so that the key events go to the layout.
@@ -128,7 +137,14 @@ class ScreenshotShelfView(context: Context, attrs: AttributeSet? = null) : 
        private const val TOUCH_PADDING_DP = 12f

    }



    override fun onInterceptHoverEvent(event: MotionEvent): Boolean {

        userInteractionCallback?.invoke()

        return super.onInterceptHoverEvent(event)

    }



    override fun onInterceptTouchEvent(ev: MotionEvent): Boolean {

        userInteractionCallback?.invoke()



        if (onTouchInterceptListener?.invoke(ev) == true) {

            return true

        }

packages/SystemUI/src/com/android/systemui/screenshot/ui/binder/ScreenshotShelfViewBinder.kt

+2 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ object ScreenshotShelfViewBinder { 
        layoutInflater: LayoutInflater,

        onDismissalRequested: (event: ScreenshotEvent, velocity: Float?) -> Unit,

        onDismissalCancelled: () -> Unit,

        onUserInteraction: () -> Unit

    ) {

        val swipeGestureListener =

            SwipeGestureListener(
@@ -53,6 +54,7 @@ object ScreenshotShelfViewBinder { 
                onCancel = onDismissalCancelled

            )

        view.onTouchInterceptListener = { swipeGestureListener.onMotionEvent(it) }

        view.userInteractionCallback = onUserInteraction



        val previewView: ImageView = view.requireViewById(R.id.screenshot_preview)

        val previewBorder = view.requireViewById<View>(R.id.screenshot_preview_border)