diff options
14 files changed, 69 insertions, 70 deletions
diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/touchpad/tutorial/ui/gesture/BackGestureMonitorTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/touchpad/tutorial/ui/gesture/BackGestureRecognizerTest.kt index cd18925eb44f..40c3f221e2df 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/touchpad/tutorial/ui/gesture/BackGestureMonitorTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/touchpad/tutorial/ui/gesture/BackGestureRecognizerTest.kt @@ -31,15 +31,15 @@ import org.junit.runner.RunWith @SmallTest @RunWith(AndroidJUnit4::class) -class BackGestureMonitorTest : SysuiTestCase() { +class BackGestureRecognizerTest : SysuiTestCase() { private var gestureState: GestureState = NotStarted - private val gestureMonitor = - BackGestureMonitor(gestureDistanceThresholdPx = SWIPE_DISTANCE.toInt()) + private val gestureRecognizer = + BackGestureRecognizer(gestureDistanceThresholdPx = SWIPE_DISTANCE.toInt()) @Before fun before() { - gestureMonitor.addGestureStateCallback { gestureState = it } + gestureRecognizer.addGestureStateCallback { gestureState = it } } @Test @@ -85,7 +85,7 @@ class BackGestureMonitorTest : SysuiTestCase() { } private fun assertStateAfterEvents(events: List<MotionEvent>, expectedState: GestureState) { - events.forEach { gestureMonitor.accept(it) } + events.forEach { gestureRecognizer.accept(it) } assertThat(gestureState).isEqualTo(expectedState) } } diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/touchpad/tutorial/ui/gesture/EasterEggGestureTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/touchpad/tutorial/ui/gesture/EasterEggGestureTest.kt index 3f1633a8972f..8406d3b99bac 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/touchpad/tutorial/ui/gesture/EasterEggGestureTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/touchpad/tutorial/ui/gesture/EasterEggGestureTest.kt @@ -36,7 +36,7 @@ class EasterEggGestureTest : SysuiTestCase() { private var triggered = false private val handler = TouchpadGestureHandler( - BackGestureMonitor(gestureDistanceThresholdPx = SWIPE_DISTANCE.toInt()), + BackGestureRecognizer(gestureDistanceThresholdPx = SWIPE_DISTANCE.toInt()), EasterEggGestureMonitor(callback = { triggered = true }), ) diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/touchpad/tutorial/ui/gesture/HomeGestureMonitorTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/touchpad/tutorial/ui/gesture/HomeGestureRecognizerTest.kt index edf0e5698bf0..043b77577978 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/touchpad/tutorial/ui/gesture/HomeGestureMonitorTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/touchpad/tutorial/ui/gesture/HomeGestureRecognizerTest.kt @@ -31,15 +31,15 @@ import org.junit.runner.RunWith @SmallTest @RunWith(AndroidJUnit4::class) -class HomeGestureMonitorTest : SysuiTestCase() { +class HomeGestureRecognizerTest : SysuiTestCase() { private var gestureState: GestureState = GestureState.NotStarted - private val gestureMonitor = - HomeGestureMonitor(gestureDistanceThresholdPx = SWIPE_DISTANCE.toInt()) + private val gestureRecognizer = + HomeGestureRecognizer(gestureDistanceThresholdPx = SWIPE_DISTANCE.toInt()) @Before fun before() { - gestureMonitor.addGestureStateCallback { gestureState = it } + gestureRecognizer.addGestureStateCallback { gestureState = it } } @Test @@ -81,7 +81,7 @@ class HomeGestureMonitorTest : SysuiTestCase() { } private fun assertStateAfterEvents(events: List<MotionEvent>, expectedState: GestureState) { - events.forEach { gestureMonitor.accept(it) } + events.forEach { gestureRecognizer.accept(it) } assertThat(gestureState).isEqualTo(expectedState) } } diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/touchpad/tutorial/ui/gesture/RecentAppsGestureMonitorTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/touchpad/tutorial/ui/gesture/RecentAppsGestureRecognizerTest.kt index f68e7732d04e..7095a91a4e5d 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/touchpad/tutorial/ui/gesture/RecentAppsGestureMonitorTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/touchpad/tutorial/ui/gesture/RecentAppsGestureRecognizerTest.kt @@ -35,7 +35,7 @@ import org.mockito.kotlin.whenever @SmallTest @RunWith(AndroidJUnit4::class) -class RecentAppsGestureMonitorTest : SysuiTestCase() { +class RecentAppsGestureRecognizerTest : SysuiTestCase() { companion object { const val THRESHOLD_VELOCITY_PX_PER_MS = 0.1f @@ -50,8 +50,8 @@ class RecentAppsGestureMonitorTest : SysuiTestCase() { // by default return correct speed for the gesture - as if pointer is slowing down on { calculateVelocity() } doReturn SLOW } - private val gestureMonitor = - RecentAppsGestureMonitor( + private val gestureRecognizer = + RecentAppsGestureRecognizer( gestureDistanceThresholdPx = SWIPE_DISTANCE.toInt(), velocityThresholdPxPerMs = THRESHOLD_VELOCITY_PX_PER_MS, velocityTracker = VerticalVelocityTracker(velocityTracker1D), @@ -59,7 +59,7 @@ class RecentAppsGestureMonitorTest : SysuiTestCase() { @Before fun before() { - gestureMonitor.addGestureStateCallback { gestureState = it } + gestureRecognizer.addGestureStateCallback { gestureState = it } } @Test @@ -107,7 +107,7 @@ class RecentAppsGestureMonitorTest : SysuiTestCase() { } private fun assertStateAfterEvents(events: List<MotionEvent>, expectedState: GestureState) { - events.forEach { gestureMonitor.accept(it) } + events.forEach { gestureRecognizer.accept(it) } assertThat(gestureState).isEqualTo(expectedState) } } diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/touchpad/tutorial/ui/gesture/TouchpadGestureHandlerTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/touchpad/tutorial/ui/gesture/TouchpadGestureHandlerTest.kt index 9f7ea679b822..a867eb38b44c 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/touchpad/tutorial/ui/gesture/TouchpadGestureHandlerTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/touchpad/tutorial/ui/gesture/TouchpadGestureHandlerTest.kt @@ -36,13 +36,13 @@ import org.junit.runner.RunWith class TouchpadGestureHandlerTest : SysuiTestCase() { private var gestureState: GestureState = GestureState.NotStarted - private val gestureMonitor = - BackGestureMonitor(gestureDistanceThresholdPx = SWIPE_DISTANCE.toInt()) - private val handler = TouchpadGestureHandler(gestureMonitor, EasterEggGestureMonitor {}) + private val gestureRecognizer = + BackGestureRecognizer(gestureDistanceThresholdPx = SWIPE_DISTANCE.toInt()) + private val handler = TouchpadGestureHandler(gestureRecognizer, EasterEggGestureMonitor {}) @Before fun before() { - gestureMonitor.addGestureStateCallback { gestureState = it } + gestureRecognizer.addGestureStateCallback { gestureState = it } } @Test diff --git a/packages/SystemUI/src/com/android/systemui/touchpad/tutorial/ui/composable/BackGestureTutorialScreen.kt b/packages/SystemUI/src/com/android/systemui/touchpad/tutorial/ui/composable/BackGestureTutorialScreen.kt index a3c757a6ce9c..0cb3a6e60041 100644 --- a/packages/SystemUI/src/com/android/systemui/touchpad/tutorial/ui/composable/BackGestureTutorialScreen.kt +++ b/packages/SystemUI/src/com/android/systemui/touchpad/tutorial/ui/composable/BackGestureTutorialScreen.kt @@ -23,7 +23,7 @@ import com.android.compose.theme.LocalAndroidColorScheme import com.android.systemui.inputdevice.tutorial.ui.composable.TutorialScreenConfig import com.android.systemui.inputdevice.tutorial.ui.composable.rememberColorFilterProperty import com.android.systemui.res.R -import com.android.systemui.touchpad.tutorial.ui.gesture.BackGestureMonitor +import com.android.systemui.touchpad.tutorial.ui.gesture.BackGestureRecognizer @Composable fun BackGestureTutorialScreen(onDoneButtonClicked: () -> Unit, onBack: () -> Unit) { @@ -43,15 +43,15 @@ fun BackGestureTutorialScreen(onDoneButtonClicked: () -> Unit, onBack: () -> Uni successResId = R.raw.trackpad_back_success, ), ) - val gestureMonitorProvider = - DistanceBasedGestureMonitorProvider( - monitorFactory = { distanceThresholdPx, gestureStateCallback -> - BackGestureMonitor(distanceThresholdPx).also { + val gestureRecognizerProvider = + DistanceBasedGestureRecognizerProvider( + recognizerFactory = { distanceThresholdPx, gestureStateCallback -> + BackGestureRecognizer(distanceThresholdPx).also { it.addGestureStateCallback(gestureStateCallback) } } ) - GestureTutorialScreen(screenConfig, gestureMonitorProvider, onDoneButtonClicked, onBack) + GestureTutorialScreen(screenConfig, gestureRecognizerProvider, onDoneButtonClicked, onBack) } @Composable diff --git a/packages/SystemUI/src/com/android/systemui/touchpad/tutorial/ui/composable/GestureTutorialScreen.kt b/packages/SystemUI/src/com/android/systemui/touchpad/tutorial/ui/composable/GestureTutorialScreen.kt index 72389cd45fe0..75c66f234bdc 100644 --- a/packages/SystemUI/src/com/android/systemui/touchpad/tutorial/ui/composable/GestureTutorialScreen.kt +++ b/packages/SystemUI/src/com/android/systemui/touchpad/tutorial/ui/composable/GestureTutorialScreen.kt @@ -37,39 +37,39 @@ import com.android.systemui.inputdevice.tutorial.ui.composable.ActionTutorialCon import com.android.systemui.inputdevice.tutorial.ui.composable.TutorialActionState import com.android.systemui.inputdevice.tutorial.ui.composable.TutorialScreenConfig import com.android.systemui.touchpad.tutorial.ui.gesture.EasterEggGestureMonitor +import com.android.systemui.touchpad.tutorial.ui.gesture.GestureRecognizer import com.android.systemui.touchpad.tutorial.ui.gesture.GestureState import com.android.systemui.touchpad.tutorial.ui.gesture.GestureState.Finished import com.android.systemui.touchpad.tutorial.ui.gesture.GestureState.InProgress import com.android.systemui.touchpad.tutorial.ui.gesture.GestureState.NotStarted import com.android.systemui.touchpad.tutorial.ui.gesture.TouchpadGestureHandler -import com.android.systemui.touchpad.tutorial.ui.gesture.TouchpadGestureMonitor -interface GestureMonitorProvider { +interface GestureRecognizerProvider { @Composable - fun rememberGestureMonitor( + fun rememberGestureRecognizer( resources: Resources, gestureStateChangedCallback: (GestureState) -> Unit, - ): TouchpadGestureMonitor + ): GestureRecognizer } typealias gestureStateCallback = (GestureState) -> Unit -class DistanceBasedGestureMonitorProvider( - val monitorFactory: (Int, gestureStateCallback) -> TouchpadGestureMonitor -) : GestureMonitorProvider { +class DistanceBasedGestureRecognizerProvider( + val recognizerFactory: (Int, gestureStateCallback) -> GestureRecognizer +) : GestureRecognizerProvider { @Composable - override fun rememberGestureMonitor( + override fun rememberGestureRecognizer( resources: Resources, gestureStateChangedCallback: (GestureState) -> Unit, - ): TouchpadGestureMonitor { + ): GestureRecognizer { val distanceThresholdPx = resources.getDimensionPixelSize( com.android.internal.R.dimen.system_gestures_distance_threshold ) return remember(distanceThresholdPx) { - monitorFactory(distanceThresholdPx, gestureStateChangedCallback) + recognizerFactory(distanceThresholdPx, gestureStateChangedCallback) } } } @@ -77,7 +77,7 @@ class DistanceBasedGestureMonitorProvider( fun GestureState.toTutorialActionState(): TutorialActionState { return when (this) { NotStarted -> TutorialActionState.NotStarted - is InProgress -> TutorialActionState.InProgress() + is InProgress -> TutorialActionState.InProgress(progress) Finished -> TutorialActionState.Finished } } @@ -85,21 +85,21 @@ fun GestureState.toTutorialActionState(): TutorialActionState { @Composable fun GestureTutorialScreen( screenConfig: TutorialScreenConfig, - gestureMonitorProvider: GestureMonitorProvider, + gestureRecognizerProvider: GestureRecognizerProvider, onDoneButtonClicked: () -> Unit, onBack: () -> Unit, ) { BackHandler(onBack = onBack) var gestureState: GestureState by remember { mutableStateOf(NotStarted) } var easterEggTriggered by remember { mutableStateOf(false) } - val gestureMonitor = - gestureMonitorProvider.rememberGestureMonitor( + val gestureRecognizer = + gestureRecognizerProvider.rememberGestureRecognizer( resources = LocalContext.current.resources, gestureStateChangedCallback = { gestureState = it }, ) val easterEggMonitor = EasterEggGestureMonitor { easterEggTriggered = true } val gestureHandler = - remember(gestureMonitor) { TouchpadGestureHandler(gestureMonitor, easterEggMonitor) } + remember(gestureRecognizer) { TouchpadGestureHandler(gestureRecognizer, easterEggMonitor) } TouchpadGesturesHandlingBox( gestureHandler, gestureState, diff --git a/packages/SystemUI/src/com/android/systemui/touchpad/tutorial/ui/composable/HomeGestureTutorialScreen.kt b/packages/SystemUI/src/com/android/systemui/touchpad/tutorial/ui/composable/HomeGestureTutorialScreen.kt index a55fa442cd96..69ec59878b14 100644 --- a/packages/SystemUI/src/com/android/systemui/touchpad/tutorial/ui/composable/HomeGestureTutorialScreen.kt +++ b/packages/SystemUI/src/com/android/systemui/touchpad/tutorial/ui/composable/HomeGestureTutorialScreen.kt @@ -23,7 +23,7 @@ import com.android.compose.theme.LocalAndroidColorScheme import com.android.systemui.inputdevice.tutorial.ui.composable.TutorialScreenConfig import com.android.systemui.inputdevice.tutorial.ui.composable.rememberColorFilterProperty import com.android.systemui.res.R -import com.android.systemui.touchpad.tutorial.ui.gesture.HomeGestureMonitor +import com.android.systemui.touchpad.tutorial.ui.gesture.HomeGestureRecognizer @Composable fun HomeGestureTutorialScreen(onDoneButtonClicked: () -> Unit, onBack: () -> Unit) { @@ -43,15 +43,15 @@ fun HomeGestureTutorialScreen(onDoneButtonClicked: () -> Unit, onBack: () -> Uni successResId = R.raw.trackpad_home_success, ), ) - val gestureMonitorProvider = - DistanceBasedGestureMonitorProvider( - monitorFactory = { distanceThresholdPx, gestureStateCallback -> - HomeGestureMonitor(distanceThresholdPx).also { + val gestureRecognizerProvider = + DistanceBasedGestureRecognizerProvider( + recognizerFactory = { distanceThresholdPx, gestureStateCallback -> + HomeGestureRecognizer(distanceThresholdPx).also { it.addGestureStateCallback(gestureStateCallback) } } ) - GestureTutorialScreen(screenConfig, gestureMonitorProvider, onDoneButtonClicked, onBack) + GestureTutorialScreen(screenConfig, gestureRecognizerProvider, onDoneButtonClicked, onBack) } @Composable diff --git a/packages/SystemUI/src/com/android/systemui/touchpad/tutorial/ui/composable/RecentAppsGestureTutorialScreen.kt b/packages/SystemUI/src/com/android/systemui/touchpad/tutorial/ui/composable/RecentAppsGestureTutorialScreen.kt index 6ee15aa952f4..3097a18b33d6 100644 --- a/packages/SystemUI/src/com/android/systemui/touchpad/tutorial/ui/composable/RecentAppsGestureTutorialScreen.kt +++ b/packages/SystemUI/src/com/android/systemui/touchpad/tutorial/ui/composable/RecentAppsGestureTutorialScreen.kt @@ -24,9 +24,9 @@ import com.android.compose.theme.LocalAndroidColorScheme import com.android.systemui.inputdevice.tutorial.ui.composable.TutorialScreenConfig import com.android.systemui.inputdevice.tutorial.ui.composable.rememberColorFilterProperty import com.android.systemui.res.R +import com.android.systemui.touchpad.tutorial.ui.gesture.GestureRecognizer import com.android.systemui.touchpad.tutorial.ui.gesture.GestureState -import com.android.systemui.touchpad.tutorial.ui.gesture.RecentAppsGestureMonitor -import com.android.systemui.touchpad.tutorial.ui.gesture.TouchpadGestureMonitor +import com.android.systemui.touchpad.tutorial.ui.gesture.RecentAppsGestureRecognizer @Composable fun RecentAppsGestureTutorialScreen(onDoneButtonClicked: () -> Unit, onBack: () -> Unit) { @@ -46,13 +46,13 @@ fun RecentAppsGestureTutorialScreen(onDoneButtonClicked: () -> Unit, onBack: () successResId = R.raw.trackpad_recent_apps_success, ), ) - val gestureMonitorProvider = - object : GestureMonitorProvider { + val gestureRecognizerProvider = + object : GestureRecognizerProvider { @Composable - override fun rememberGestureMonitor( + override fun rememberGestureRecognizer( resources: Resources, gestureStateChangedCallback: (GestureState) -> Unit, - ): TouchpadGestureMonitor { + ): GestureRecognizer { val distanceThresholdPx = resources.getDimensionPixelSize( com.android.internal.R.dimen.system_gestures_distance_threshold @@ -60,13 +60,12 @@ fun RecentAppsGestureTutorialScreen(onDoneButtonClicked: () -> Unit, onBack: () val velocityThresholdPxPerMs = resources.getDimension(R.dimen.touchpad_recent_apps_gesture_velocity_threshold) return remember(distanceThresholdPx, velocityThresholdPxPerMs) { - RecentAppsGestureMonitor(distanceThresholdPx, velocityThresholdPxPerMs).also { - it.addGestureStateCallback(gestureStateChangedCallback) - } + RecentAppsGestureRecognizer(distanceThresholdPx, velocityThresholdPxPerMs) + .also { it.addGestureStateCallback(gestureStateChangedCallback) } } } } - GestureTutorialScreen(screenConfig, gestureMonitorProvider, onDoneButtonClicked, onBack) + GestureTutorialScreen(screenConfig, gestureRecognizerProvider, onDoneButtonClicked, onBack) } @Composable diff --git a/packages/SystemUI/src/com/android/systemui/touchpad/tutorial/ui/gesture/BackGestureMonitor.kt b/packages/SystemUI/src/com/android/systemui/touchpad/tutorial/ui/gesture/BackGestureRecognizer.kt index 490f04d55802..56e97a357d67 100644 --- a/packages/SystemUI/src/com/android/systemui/touchpad/tutorial/ui/gesture/BackGestureMonitor.kt +++ b/packages/SystemUI/src/com/android/systemui/touchpad/tutorial/ui/gesture/BackGestureRecognizer.kt @@ -19,8 +19,8 @@ package com.android.systemui.touchpad.tutorial.ui.gesture import android.view.MotionEvent import kotlin.math.abs -/** Monitors for touchpad back gesture, that is three fingers swiping left or right */ -class BackGestureMonitor(private val gestureDistanceThresholdPx: Int) : TouchpadGestureMonitor { +/** Recognizes touchpad back gesture, that is three fingers swiping left or right */ +class BackGestureRecognizer(private val gestureDistanceThresholdPx: Int) : GestureRecognizer { private val distanceTracker = DistanceTracker() private var gestureStateChangedCallback: (GestureState) -> Unit = {} diff --git a/packages/SystemUI/src/com/android/systemui/touchpad/tutorial/ui/gesture/TouchpadGestureMonitor.kt b/packages/SystemUI/src/com/android/systemui/touchpad/tutorial/ui/gesture/GestureRecognizer.kt index 9216821272ff..d146268304a6 100644 --- a/packages/SystemUI/src/com/android/systemui/touchpad/tutorial/ui/gesture/TouchpadGestureMonitor.kt +++ b/packages/SystemUI/src/com/android/systemui/touchpad/tutorial/ui/gesture/GestureRecognizer.kt @@ -19,8 +19,8 @@ package com.android.systemui.touchpad.tutorial.ui.gesture import android.view.MotionEvent import java.util.function.Consumer -/** Monitor for touchpad gestures that can notify callback when [GestureState] changes. */ -interface TouchpadGestureMonitor : Consumer<MotionEvent> { +/** Based on passed [MotionEvent]s recognizes different states of gesture and notifies callback. */ +interface GestureRecognizer : Consumer<MotionEvent> { fun addGestureStateCallback(callback: (GestureState) -> Unit) } diff --git a/packages/SystemUI/src/com/android/systemui/touchpad/tutorial/ui/gesture/HomeGestureMonitor.kt b/packages/SystemUI/src/com/android/systemui/touchpad/tutorial/ui/gesture/HomeGestureRecognizer.kt index 83d4f566257b..3db9d7ccc8f7 100644 --- a/packages/SystemUI/src/com/android/systemui/touchpad/tutorial/ui/gesture/HomeGestureMonitor.kt +++ b/packages/SystemUI/src/com/android/systemui/touchpad/tutorial/ui/gesture/HomeGestureRecognizer.kt @@ -18,8 +18,8 @@ package com.android.systemui.touchpad.tutorial.ui.gesture import android.view.MotionEvent -/** Monitors for touchpad home gesture, that is three fingers swiping up */ -class HomeGestureMonitor(private val gestureDistanceThresholdPx: Int) : TouchpadGestureMonitor { +/** Recognizes touchpad home gesture, that is three fingers swiping up */ +class HomeGestureRecognizer(private val gestureDistanceThresholdPx: Int) : GestureRecognizer { private val distanceTracker = DistanceTracker() private var gestureStateChangedCallback: (GestureState) -> Unit = {} diff --git a/packages/SystemUI/src/com/android/systemui/touchpad/tutorial/ui/gesture/RecentAppsGestureMonitor.kt b/packages/SystemUI/src/com/android/systemui/touchpad/tutorial/ui/gesture/RecentAppsGestureRecognizer.kt index 1731bb85fba4..a194ad6a8016 100644 --- a/packages/SystemUI/src/com/android/systemui/touchpad/tutorial/ui/gesture/RecentAppsGestureMonitor.kt +++ b/packages/SystemUI/src/com/android/systemui/touchpad/tutorial/ui/gesture/RecentAppsGestureRecognizer.kt @@ -20,16 +20,16 @@ import android.view.MotionEvent import kotlin.math.abs /** - * Monitors recent apps gesture completion. That is - using three fingers on touchpad - swipe up - * over some distance threshold and then slow down gesture before fingers are lifted. Implementation - * is based on [com.android.quickstep.util.TriggerSwipeUpTouchTracker] + * Recognizes apps gesture completion. That is - using three fingers on touchpad - swipe up over + * some distance threshold and then slow down gesture before fingers are lifted. Implementation is + * based on [com.android.quickstep.util.TriggerSwipeUpTouchTracker] */ -class RecentAppsGestureMonitor( +class RecentAppsGestureRecognizer( private val gestureDistanceThresholdPx: Int, private val velocityThresholdPxPerMs: Float, private val distanceTracker: DistanceTracker = DistanceTracker(), private val velocityTracker: VerticalVelocityTracker = VerticalVelocityTracker(), -) : TouchpadGestureMonitor { +) : GestureRecognizer { private var gestureStateChangedCallback: (GestureState) -> Unit = {} diff --git a/packages/SystemUI/src/com/android/systemui/touchpad/tutorial/ui/gesture/TouchpadGestureHandler.kt b/packages/SystemUI/src/com/android/systemui/touchpad/tutorial/ui/gesture/TouchpadGestureHandler.kt index 4b82ba1c0dda..21e2917cf01b 100644 --- a/packages/SystemUI/src/com/android/systemui/touchpad/tutorial/ui/gesture/TouchpadGestureHandler.kt +++ b/packages/SystemUI/src/com/android/systemui/touchpad/tutorial/ui/gesture/TouchpadGestureHandler.kt @@ -25,7 +25,7 @@ import java.util.function.Consumer * motion events passed to [onMotionEvent] and will filter touchpad events accordingly */ class TouchpadGestureHandler( - private val gestureMonitor: Consumer<MotionEvent>, + private val gestureRecognizer: Consumer<MotionEvent>, private val easterEggGestureMonitor: EasterEggGestureMonitor, ) { @@ -41,7 +41,7 @@ class TouchpadGestureHandler( if (isTwoFingerSwipe(event)) { easterEggGestureMonitor.processTouchpadEvent(event) } else { - gestureMonitor.accept(event) + gestureRecognizer.accept(event) } true } else { |