Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5412cd41 authored by Brad Hinegardner's avatar Brad Hinegardner
Browse files

Set keyguardPreviewRenderer large clock margin to real large clock margin 

Make these the same values.

Ideally these would target the same variable, however
to minimize risk I'm just changing it this way for now.

Bug: 415323661
Test: manual
Flag: com.android.systemui.shared.clock_reactive_smartspace_layout
Change-Id: I4d76b508e57d329f7963aae26fc3a6849c4f36c0
parent f225fe41

packages/SystemUI/customization/clocks/common/src/com/android/systemui/customization/clocks/DefaultClockFaceLayout.kt

+13 −6
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ open class DefaultClockFaceLayout(val view: View) : ClockFaceLayout { 
    }



    override fun applyExternalDisplayPresentationConstraints(

        constraints: ConstraintSet,

        constraints: ConstraintSet

    ): ConstraintSet {

        return constraints.apply {

            constrainWidth(ClockViewIds.LOCKSCREEN_CLOCK_VIEW_LARGE, WRAP_CONTENT)
@@ -70,11 +70,18 @@ open class DefaultClockFaceLayout(val view: View) : ClockFaceLayout { 
            constrainMaxHeight(ClockViewIds.LOCKSCREEN_CLOCK_VIEW_LARGE, 0)



            val largeClockTopMargin =

                if (com.android.systemui.shared.Flags.clockReactiveSmartspaceLayout()) {

                    view.context.getSafeStatusBarHeight() / 2 +

                        res.getDimensionPixelSize(clocksR.dimen.keyguard_smartspace_top_offset) +

                        res.getDimensionPixelSize(clocksR.dimen.enhanced_smartspace_height)

                } else {

                    view.context.getSafeStatusBarHeight() +

                        res.getDimensionPixelSize(clocksR.dimen.small_clock_padding_top) +

                        res.getDimensionPixelSize(clocksR.dimen.keyguard_smartspace_top_offset) +

                        res.getDimensionPixelSize(clocksR.dimen.date_weather_view_height) +

                        res.getDimensionPixelSize(clocksR.dimen.enhanced_smartspace_height)

                }



            connect(

                ClockViewIds.LOCKSCREEN_CLOCK_VIEW_LARGE,

                TOP,