Merge "Fix clock being too low in AOD" into tm-qpr-dev

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

        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)

        }

        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"