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

Merge "Fix clock being too low in AOD" into tm-qpr-dev am: 31c241cb3f

Browse Source 
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>
This commit is contained in:
Hawkwood Glazier
2022-12-01 22:05:56 +00:00
committed by Automerger Merge Worker
parent 439da33610 31c241cb3f
commit 5b8926f15a
2 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,7 +20,6 @@ import android.graphics.Rect
import android.icu.text.NumberFormat import android.icu.text.NumberFormat
import android.util.TypedValue import android.util.TypedValue
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View
import android.widget.FrameLayout import android.widget.FrameLayout
import androidx.annotation.VisibleForTesting import androidx.annotation.VisibleForTesting
import com.android.systemui.customization.R import com.android.systemui.customization.R
@@ -152,15 +151,9 @@ class DefaultClockController(
view: AnimatableClockView, view: AnimatableClockView,
) : DefaultClockFaceController(view) { ) : DefaultClockFaceController(view) {
override fun recomputePadding(targetRegion: Rect?) { override fun recomputePadding(targetRegion: Rect?) {
// We center the view within the targetRegion instead of within the parent // Ignore Target Region until top padding fixed in aod
// 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
val lp = view.getLayoutParams() as FrameLayout.LayoutParams 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) view.setLayoutParams(lp)
} }

1
packages/SystemUI/res-keyguard/layout/keyguard_clock_switch.xml
View File

@@ -35,6 +35,7 @@
android:visibility="invisible" /> android:visibility="invisible" />
<FrameLayout <FrameLayout
android:id="@+id/lockscreen_clock_view_large" android:id="@+id/lockscreen_clock_view_large"
android:layout_marginTop="@dimen/keyguard_large_clock_top_margin"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:clipChildren="false" android:clipChildren="false"