diff options
| author | 2023-05-17 17:48:58 +0000 | |
|---|---|---|
| committer | 2023-05-17 17:48:58 +0000 | |
| commit | e4e52c9ca007ec156e2dff87290d061bac0fc51f (patch) | |
| tree | e74f72f5bad773aff9665e384309f8b4bcebe390 | |
| parent | 646bc9b1c84ed900b3b5be998ac53df5c83abbc9 (diff) | |
| parent | 7a973036ecaa0a15cf7361a6ee82a3941d58926f (diff) | |
Merge "Fix clock scale in picker" into udc-dev am: 7a973036ec
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23215946
Change-Id: I42628b197450922f21f1c76c01e3af56aad20de1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | packages/SystemUI/customization/src/com/android/systemui/shared/clocks/DefaultClockController.kt | 2 | ||||
| -rw-r--r-- | packages/SystemUI/plugin/src/com/android/systemui/plugins/ClockProviderPlugin.kt | 2 |
2 files changed, 2 insertions, 2 deletions
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 6aa74fbf24e7..252c8e343e0e 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 @@ -265,7 +265,7 @@ class DefaultClockController( } } - override fun onPickerCarouselSwiping(swipingFraction: Float, previewRatio: Float) { + override fun onPickerCarouselSwiping(swipingFraction: 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 diff --git a/packages/SystemUI/plugin/src/com/android/systemui/plugins/ClockProviderPlugin.kt b/packages/SystemUI/plugin/src/com/android/systemui/plugins/ClockProviderPlugin.kt index 7bf139e69f2e..5d0a3af74e5d 100644 --- a/packages/SystemUI/plugin/src/com/android/systemui/plugins/ClockProviderPlugin.kt +++ b/packages/SystemUI/plugin/src/com/android/systemui/plugins/ClockProviderPlugin.kt @@ -156,7 +156,7 @@ interface ClockAnimations { * Runs when swiping clock picker, swipingFraction: 1.0 -> clock is scaled up in the preview, * 0.0 -> clock is scaled down in the shade; previewRatio is previewSize / screenSize */ - fun onPickerCarouselSwiping(swipingFraction: Float, previewRatio: Float) {} + fun onPickerCarouselSwiping(swipingFraction: Float) {} } /** Events that have specific data about the related face */ |