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

Commit 4caf1ac0 authored by Hawkwood Glazier's avatar Hawkwood Glazier Committed by Android (Google) Code Review
Browse files

Merge "Host process provides status bar margin horizontal" into main

parents 7a4ec7fe d8d3c589

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

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ open class DefaultClockFaceLayout(val view: View) : ClockFaceLayout { 
                PARENT_ID,

                START,

                res.getDimensionPixelSize(clocksR.dimen.clock_padding_start) +

                    res.getDimensionPixelSize(clocksR.dimen.status_view_margin_horizontal),

                    clockPreviewConfig.statusViewMarginHorizontal,

            )



            val smallClockTopMargin = clockPreviewConfig.getSmallClockTopPadding()

packages/SystemUI/plugin/src/com/android/systemui/plugins/clocks/ClockPreviewConfig.kt

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ data class ClockPreviewConfig( 
    val statusBarHeight: Int,

    val splitShadeTopMargin: Int,

    val clockTopMargin: Int,

    val statusViewMarginHorizontal: Int,

    val lockViewId: Int? = null,

    val udfpsTop: Float? = null,

) {

packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardClockViewModel.kt

+4 −0
Original line number Diff line number Diff line
@@ -169,6 +169,10 @@ constructor( 
                    ),

                clockTopMargin =

                    context.resources.getDimensionPixelSize(SysuiR.dimen.keyguard_clock_top_margin),

                statusViewMarginHorizontal =

                    context.resources.getDimensionPixelSize(

                        clocksR.dimen.status_view_margin_horizontal

                    ),

            )

            .getSmallClockTopPadding()

    }

packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardPreviewViewModel.kt

+5 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.os.Bundle 
import android.os.IBinder

import android.view.Display

import com.android.internal.policy.SystemBarUtils

import com.android.systemui.customization.clocks.R as clocksR

import com.android.systemui.keyguard.domain.interactor.KeyguardPreviewInteractor

import com.android.systemui.plugins.clocks.ClockPreviewConfig

import com.android.systemui.res.R as SysuiR
@@ -79,6 +80,10 @@ constructor(@Assisted private val interactor: KeyguardPreviewInteractor) { 
                previewContext.resources.getDimensionPixelSize(

                    SysuiR.dimen.keyguard_clock_top_margin

                ),

            statusViewMarginHorizontal =

                previewContext.resources.getDimensionPixelSize(

                    clocksR.dimen.status_view_margin_horizontal

                ),

        )

    }

}