diff options
| author | 2022-12-01 22:05:56 +0000 | |
|---|---|---|
| committer | 2022-12-01 22:05:56 +0000 | |
| commit | 5b8926f15aee41dac85d3d8c7b80169177cce28a (patch) | |
| tree | 01e98222f5c25af42c6476feb3c08646b3109caf | |
| parent | 439da336103c9ad683b013f11e1fd7ce6415c557 (diff) | |
| parent | 31c241cb3f11890eea37e0374e918e00d2d48be7 (diff) | |
Merge "Fix clock being too low in AOD" into tm-qpr-dev am: 31c241cb3f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20581064
Change-Id: I64d9bf9a21c17475c6b3bf71ad10a034809e1e13
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 | 11 | ||||
| -rw-r--r-- | packages/SystemUI/res-keyguard/layout/keyguard_clock_switch.xml | 1 |
2 files changed, 3 insertions, 9 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 869884474ffe..e1f21742bf93 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 @@ -20,7 +20,6 @@ import android.graphics.Rect import android.icu.text.NumberFormat import android.util.TypedValue import android.view.LayoutInflater -import android.view.View import android.widget.FrameLayout import androidx.annotation.VisibleForTesting import com.android.systemui.customization.R @@ -152,15 +151,9 @@ class DefaultClockController( view: AnimatableClockView, ) : DefaultClockFaceController(view) { override fun recomputePadding(targetRegion: Rect?) { - // We center the view within the targetRegion instead of within the parent - // view by computing the difference and adding that to the padding. - val parent = view.parent - val yDiff = - if (targetRegion != null && parent is View && parent.isLaidOut()) - targetRegion.centerY() - parent.height / 2f - else 0f + // Ignore Target Region until top padding fixed in aod val lp = view.getLayoutParams() as FrameLayout.LayoutParams - lp.topMargin = (-0.5f * view.bottom + yDiff).toInt() + lp.topMargin = (-0.5f * view.bottom).toInt() view.setLayoutParams(lp) } diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_clock_switch.xml b/packages/SystemUI/res-keyguard/layout/keyguard_clock_switch.xml index b49afeef09f3..218c5cc9b7fe 100644 --- a/packages/SystemUI/res-keyguard/layout/keyguard_clock_switch.xml +++ b/packages/SystemUI/res-keyguard/layout/keyguard_clock_switch.xml @@ -35,6 +35,7 @@ android:visibility="invisible" /> <FrameLayout android:id="@+id/lockscreen_clock_view_large" + android:layout_marginTop="@dimen/keyguard_large_clock_top_margin" android:layout_width="match_parent" android:layout_height="match_parent" android:clipChildren="false" |