| commit | d2edaad62491dce2bbfcfacfe6b7517153009ff3 | [log] [tgz] |
|---|---|---|
| author | Sherry Zhou <yuandizhou@google.com> | Thu Apr 20 19:43:53 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Apr 20 19:43:53 2023 +0000 |
| tree | 912da33659cf7a9c40bd3fc870bad3aa5e7dfcc8 | |
| parent | 9f205571762508e57e09995973c8f6a32530c460 [diff] | |
| parent | f512697f6ccc6318bda125fc61f9399ed1e17afa [diff] |
Merge "Fix default clock moving up in picker preview" into udc-dev am: e52cc3b07c am: f512697f6c Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22750288 Change-Id: Iac2201f045c7354b5044fad4856b584525e9e43f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/DefaultClockController.kt b/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/DefaultClockController.kt index 6ca7f12..3fda83d 100644 --- a/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/DefaultClockController.kt +++ b/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/DefaultClockController.kt
@@ -263,6 +263,13 @@ 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(