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

Commit 63a913d7 authored by Michal Brzezinski's avatar Michal Brzezinski
Browse files

Renaming TouchpadGestureMonitor to GestureRecognizer 

And other changes are just consequence of that: renaming all its subclasses, field names etc

Bug: 369817369
Test: All tests are passing
Flag: com.android.systemui.shared.new_touchpad_gestures_tutorial
Change-Id: I48e278e43d83258b5f6e26062747d9fe0b9ca9b5
parent 42222465

packages/SystemUI/multivalentTests/src/com/android/systemui/touchpad/tutorial/ui/gesture/BackGestureMonitorTest.kt→packages/SystemUI/multivalentTests/src/com/android/systemui/touchpad/tutorial/ui/gesture/BackGestureRecognizerTest.kt

+5 −5
Original line number Diff line number Diff line
@@ -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)

    }

}

packages/SystemUI/multivalentTests/src/com/android/systemui/touchpad/tutorial/ui/gesture/EasterEggGestureTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -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 }),

        )

packages/SystemUI/multivalentTests/src/com/android/systemui/touchpad/tutorial/ui/gesture/HomeGestureMonitorTest.kt→packages/SystemUI/multivalentTests/src/com/android/systemui/touchpad/tutorial/ui/gesture/HomeGestureRecognizerTest.kt

+5 −5
Original line number Diff line number Diff line
@@ -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)

    }

}

packages/SystemUI/multivalentTests/src/com/android/systemui/touchpad/tutorial/ui/gesture/RecentAppsGestureMonitorTest.kt→packages/SystemUI/multivalentTests/src/com/android/systemui/touchpad/tutorial/ui/gesture/RecentAppsGestureRecognizerTest.kt

+5 −5
Original line number Diff line number Diff line
@@ -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)

    }

}

packages/SystemUI/multivalentTests/src/com/android/systemui/touchpad/tutorial/ui/gesture/TouchpadGestureHandlerTest.kt

+4 −4
Original line number Diff line number Diff line
@@ -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