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

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

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

Change-Id: Iab8ae82edfdd1fa75510bfba15b365fa062ee770
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Yunfan Chen
2023-05-08 00:48:10 +00:00
committed by Automerger Merge Worker
parent 31a9a54eaf 0a141fd6fa
commit c7f4751bf6
4 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,7 +22,6 @@ import android.os.Looper
import android.view.Choreographer import android.view.Choreographer
import android.view.InputEvent import android.view.InputEvent
import android.view.MotionEvent import android.view.MotionEvent
import com.android.systemui.settings.DisplayTracker
import com.android.systemui.shared.system.InputChannelCompat import com.android.systemui.shared.system.InputChannelCompat
import com.android.systemui.shared.system.InputMonitorCompat import com.android.systemui.shared.system.InputMonitorCompat
@@ -39,7 +38,7 @@ import com.android.systemui.shared.system.InputMonitorCompat
*/ */
abstract class GenericGestureDetector( abstract class GenericGestureDetector(
private val tag: String, 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 * Active callbacks, each associated with a tag. Gestures will only be monitored if
@@ -87,7 +86,7 @@ abstract class GenericGestureDetector(
internal open fun startGestureListening() { internal open fun startGestureListening() {
stopGestureListening() stopGestureListening()
inputMonitor = InputMonitorCompat(tag, displayTracker.defaultDisplayId).also { inputMonitor = InputMonitorCompat(tag, displayId).also {
inputReceiver = it.getInputReceiver( inputReceiver = it.getInputReceiver(
Looper.getMainLooper(), Looper.getMainLooper(),
Choreographer.getInstance(), Choreographer.getInstance(),

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

@@ -36,7 +36,10 @@ abstract class SwipeUpGestureHandler(
displayTracker: DisplayTracker, displayTracker: DisplayTracker,
private val logger: SwipeUpGestureLogger, private val logger: SwipeUpGestureLogger,
private val loggerTag: String, private val loggerTag: String,
) : GenericGestureDetector(SwipeUpGestureHandler::class.simpleName!!, displayTracker) { ) : GenericGestureDetector(
SwipeUpGestureHandler::class.simpleName!!,
displayTracker.defaultDisplayId
) {
private var startY: Float = 0f private var startY: Float = 0f
private var startTime: Long = 0L private var startTime: Long = 0L

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

@@ -32,7 +32,10 @@ import javax.inject.Inject
class TapGestureDetector @Inject constructor( class TapGestureDetector @Inject constructor(
private val context: Context, private val context: Context,
displayTracker: DisplayTracker displayTracker: DisplayTracker
) : GenericGestureDetector(TapGestureDetector::class.simpleName!!, displayTracker) { ) : GenericGestureDetector(
TapGestureDetector::class.simpleName!!,
displayTracker.defaultDisplayId
) {
private val gestureListener = object : GestureDetector.SimpleOnGestureListener() { private val gestureListener = object : GestureDetector.SimpleOnGestureListener() {
override fun onSingleTapUp(e: MotionEvent): Boolean { override fun onSingleTapUp(e: MotionEvent): Boolean {

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

@@ -118,7 +118,10 @@ class GenericGestureDetectorTest : SysuiTestCase() {
assertThat(oldCallbackNotified).isFalse() assertThat(oldCallbackNotified).isFalse()
} }
inner class TestGestureDetector : GenericGestureDetector("fakeTag", displayTracker) { inner class TestGestureDetector : GenericGestureDetector(
"fakeTag",
displayTracker.defaultDisplayId
) {
var isGestureListening = false var isGestureListening = false
override fun onInputEvent(ev: InputEvent) { override fun onInputEvent(ev: InputEvent) {