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

Commit 8e870d0b authored by Yunfan Chen's avatar Yunfan Chen Committed by Automerger Merge Worker
Browse files

Let gesture detector take display ID as param (2/n) am: 0a141fd6 am: c7f4751b 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22788843



Change-Id: Id38681ac8926131ac8fb440288bae685e09e0184
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 659aac76 c7f4751b

packages/SystemUI/src/com/android/systemui/statusbar/gesture/GenericGestureDetector.kt

+2 −3
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import android.os.Looper 
import android.view.Choreographer

import android.view.InputEvent

import android.view.MotionEvent

import com.android.systemui.settings.DisplayTracker

import com.android.systemui.shared.system.InputChannelCompat

import com.android.systemui.shared.system.InputMonitorCompat
@@ -39,7 +38,7 @@ import com.android.systemui.shared.system.InputMonitorCompat 
 */

abstract class GenericGestureDetector(

    private val tag: String,

    private val displayTracker: DisplayTracker

    private val displayId: Int,

) {

    /**

     * Active callbacks, each associated with a tag. Gestures will only be monitored if
@@ -87,7 +86,7 @@ abstract class GenericGestureDetector( 
    internal open fun startGestureListening() {

        stopGestureListening()



        inputMonitor = InputMonitorCompat(tag, displayTracker.defaultDisplayId).also {

        inputMonitor = InputMonitorCompat(tag, displayId).also {

            inputReceiver = it.getInputReceiver(

                Looper.getMainLooper(),

                Choreographer.getInstance(),

packages/SystemUI/src/com/android/systemui/statusbar/gesture/SwipeUpGestureHandler.kt

+4 −1
Original line number Diff line number Diff line
@@ -36,7 +36,10 @@ abstract class SwipeUpGestureHandler( 
    displayTracker: DisplayTracker,

    private val logger: SwipeUpGestureLogger,

    private val loggerTag: String,

) : GenericGestureDetector(SwipeUpGestureHandler::class.simpleName!!, displayTracker) {

) : GenericGestureDetector(

        SwipeUpGestureHandler::class.simpleName!!,

        displayTracker.defaultDisplayId

) {



    private var startY: Float = 0f

    private var startTime: Long = 0L

packages/SystemUI/src/com/android/systemui/statusbar/gesture/TapGestureDetector.kt

+4 −1
Original line number Diff line number Diff line
@@ -32,7 +32,10 @@ import javax.inject.Inject 
class TapGestureDetector @Inject constructor(

    private val context: Context,

    displayTracker: DisplayTracker

) : GenericGestureDetector(TapGestureDetector::class.simpleName!!, displayTracker) {

) : GenericGestureDetector(

        TapGestureDetector::class.simpleName!!,

        displayTracker.defaultDisplayId

) {



    private val gestureListener = object : GestureDetector.SimpleOnGestureListener() {

        override fun onSingleTapUp(e: MotionEvent): Boolean {

packages/SystemUI/tests/src/com/android/systemui/statusbar/gesture/GenericGestureDetectorTest.kt

+4 −1
Original line number Diff line number Diff line
@@ -118,7 +118,10 @@ class GenericGestureDetectorTest : SysuiTestCase() { 
        assertThat(oldCallbackNotified).isFalse()

    }



    inner class TestGestureDetector : GenericGestureDetector("fakeTag", displayTracker) {

    inner class TestGestureDetector : GenericGestureDetector(

            "fakeTag",

            displayTracker.defaultDisplayId

    ) {

        var isGestureListening = false



        override fun onInputEvent(ev: InputEvent) {