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

Commit d2edaad6 authored by Sherry Zhou's avatar Sherry Zhou Committed by Automerger Merge Worker
Browse files

Merge "Fix default clock moving up in picker preview" into udc-dev am: e52cc3b0 am: f512697f 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22750288



Change-Id: Iac2201f045c7354b5044fad4856b584525e9e43f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9f205571 f512697f

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

+7 −0
Original line number Diff line number Diff line
@@ -263,6 +263,13 @@ class DefaultClockController( 
                view.animateDoze(dozeState.isActive, !hasJumped)

            }

        }



        override fun onPickerCarouselSwiping(swipingFraction: Float, previewRatio: Float) {

            // TODO(b/278936436): refactor this part when we change recomputePadding

            // when on the side, swipingFraction = 0, translationY should offset

            // the top margin change in recomputePadding to make clock be centered

            view.translationY = 0.5f * view.bottom * (1 - swipingFraction)

        }

    }



    inner class LargeClockAnimations(