Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix clock scale in picker" into udc-dev am: 7a973036ec

Browse Source 
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>
This commit is contained in:
Sherry Zhou
2023-05-17 17:48:58 +00:00
committed by Automerger Merge Worker
parent 646bc9b1c8 7a973036ec
commit e4e52c9ca0
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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 // TODO(b/278936436): refactor this part when we change recomputePadding
// when on the side, swipingFraction = 0, translationY should offset // when on the side, swipingFraction = 0, translationY should offset
// the top margin change in recomputePadding to make clock be centered // the top margin change in recomputePadding to make clock be centered

2
packages/SystemUI/plugin/src/com/android/systemui/plugins/ClockProviderPlugin.kt
View File

@@ -156,7 +156,7 @@ interface ClockAnimations {
* Runs when swiping clock picker, swipingFraction: 1.0 -> clock is scaled up in the preview, * 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 * 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 */ /** Events that have specific data about the related face */