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

Commit 99c2aa8a authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Route FidgetTaps to clocks when appropriate" into main

parents 0e7d06fc b4b39c17

packages/SystemUI/customization/src/com/android/systemui/shared/clocks/ComposedDigitalLayerController.kt

+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 =

packages/SystemUI/customization/src/com/android/systemui/shared/clocks/DefaultClockController.kt

+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(

packages/SystemUI/customization/src/com/android/systemui/shared/clocks/FlexClockFaceController.kt

+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)

            }

        }

packages/SystemUI/customization/src/com/android/systemui/shared/clocks/SimpleDigitalHandLayerController.kt

+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 =

packages/SystemUI/customization/src/com/android/systemui/shared/clocks/view/FlexClockView.kt

+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 {