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

Commit 5e1de3e7 authored by Michal Brzezinski's avatar Michal Brzezinski
Browse files

1/n refactoring: renaming EasterEggGestureMonitor to EasterEggGestureRecognizer 

Bug: 384509663
Test: EasterEggGestureRecognizerTest
Flag: com.android.systemui.shared.new_touchpad_gestures_tutorial
Change-Id: I606fa3f350d518d91914f00cfb2be2c2b2ecd986
parent 936c1902

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

+2 −2
Original line number Diff line number Diff line
@@ -29,10 +29,10 @@ import org.junit.runner.RunWith 


@SmallTest

@RunWith(AndroidJUnit4::class)

class EasterEggGestureTest : SysuiTestCase() {

class EasterEggGestureRecognizerTest : SysuiTestCase() {



    private var triggered = false

    private val gestureRecognizer = EasterEggGestureMonitor()

    private val gestureRecognizer = EasterEggGestureRecognizer()

    private val handler = TouchpadGestureHandler(gestureRecognizer)



    @Before

packages/SystemUI/src/com/android/systemui/touchpad/tutorial/ui/gesture/EasterEggGestureMonitor.kt→packages/SystemUI/src/com/android/systemui/touchpad/tutorial/ui/gesture/EasterEggGestureRecognizer.kt

+2 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
package com.android.systemui.touchpad.tutorial.ui.gesture



import android.view.MotionEvent

import com.android.systemui.touchpad.tutorial.ui.gesture.EasterEggGestureMonitor.Companion.CIRCLES_COUNT_THRESHOLD

import com.android.systemui.touchpad.tutorial.ui.gesture.EasterEggGestureRecognizer.Companion.CIRCLES_COUNT_THRESHOLD

import kotlin.math.abs

import kotlin.math.atan2

import kotlin.math.pow
@@ -28,7 +28,7 @@ import kotlin.math.sqrt 
 * clockwise within one two-fingers gesture. It tries to be on the safer side of not triggering

 * gesture if we're not sure if full circle was done.

 */

class EasterEggGestureMonitor : GestureRecognizer {

class EasterEggGestureRecognizer : GestureRecognizer {



    private var gestureStateChangedCallback: (GestureState) -> Unit = {}

packages/SystemUI/src/com/android/systemui/touchpad/tutorial/ui/viewmodel/EasterEggGestureViewModel.kt

+4 −4
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
package com.android.systemui.touchpad.tutorial.ui.viewmodel



import android.view.MotionEvent

import com.android.systemui.touchpad.tutorial.ui.gesture.EasterEggGestureMonitor

import com.android.systemui.touchpad.tutorial.ui.gesture.EasterEggGestureRecognizer

import com.android.systemui.touchpad.tutorial.ui.gesture.GestureFlowAdapter

import com.android.systemui.touchpad.tutorial.ui.gesture.GestureState

import com.android.systemui.touchpad.tutorial.ui.gesture.TouchpadGestureHandler
@@ -30,13 +30,13 @@ import kotlinx.coroutines.flow.onStart 
import kotlinx.coroutines.flow.receiveAsFlow



class EasterEggGestureViewModel(

    easterEggMonitor: EasterEggGestureMonitor = EasterEggGestureMonitor()

    gestureRecognizer: EasterEggGestureRecognizer = EasterEggGestureRecognizer()

) : Consumer<MotionEvent> {



    private val handler = TouchpadGestureHandler(easterEggMonitor)

    private val handler = TouchpadGestureHandler(gestureRecognizer)



    private val gestureDone =

        GestureFlowAdapter(easterEggMonitor).gestureStateAsFlow.filter {

        GestureFlowAdapter(gestureRecognizer).gestureStateAsFlow.filter {

            it == GestureState.Finished

        }