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

Commit b4b39c17 authored by Hawkwood Glazier's avatar Hawkwood Glazier
Browse files

Route FidgetTaps to clocks when appropriate

Bug: 374305993
Test: Verified data arrived at endpoint
Flag: NONE interface/routing change
Change-Id: Ifb197227cbb6d7e906ddaa22806ed51f0adeb492
parent d8a84756
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -137,6 +137,10 @@ class ComposedDigitalLayerController(private val clockCtx: ClockContext) :
            override fun onPositionUpdated(distance: Float, fraction: Float) {}

            override fun onPickerCarouselSwiping(swipingFraction: Float) {}

            override fun onFidgetTap(x: Float, y: Float) {
                view.animateFidget(x, y)
            }
        }

    override val faceEvents =
+2 −0
Original line number Diff line number Diff line
@@ -284,6 +284,8 @@ class DefaultClockController(
        override fun onPositionUpdated(fromLeft: Int, direction: Int, fraction: Float) {}

        override fun onPositionUpdated(distance: Float, fraction: Float) {}

        override fun onFidgetTap(x: Float, y: Float) {}
    }

    inner class LargeClockAnimations(
+4 −1
Original line number Diff line number Diff line
@@ -230,7 +230,10 @@ class FlexClockFaceController(clockCtx: ClockContext, private val isLargeClock:

            override fun onPositionUpdated(distance: Float, fraction: Float) {
                layerController.animations.onPositionUpdated(distance, fraction)
                // TODO(b/378128811) port stepping animation
            }

            override fun onFidgetTap(x: Float, y: Float) {
                layerController.animations.onFidgetTap(x, y)
            }
        }

+4 −0
Original line number Diff line number Diff line
@@ -207,6 +207,10 @@ open class SimpleDigitalHandLayerController(
            override fun onPositionUpdated(fromLeft: Int, direction: Int, fraction: Float) {}

            override fun onPositionUpdated(distance: Float, fraction: Float) {}

            override fun onFidgetTap(x: Float, y: Float) {
                view.animateFidget(x, y)
            }
        }

    override val faceEvents =
+4 −0
Original line number Diff line number Diff line
@@ -281,6 +281,10 @@ class FlexClockView(clockCtx: ClockContext) : FrameLayout(clockCtx.context) {
        }
    }

    fun animateFidget(x: Float, y: Float) {
        digitalClockTextViewMap.forEach { _, view -> view.animateFidget(x, y) }
    }

    private fun updateLocale(locale: Locale) {
        isMonoVerticalNumericLineSpacing =
            !NON_MONO_VERTICAL_NUMERIC_LINE_SPACING_LANGUAGES.any {
Loading