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

Commit 18235e5f authored by Sherry Zhou's avatar Sherry Zhou Committed by Android (Google) Code Review
Browse files

Merge "Remove usage of status_bar_height in clocks" into main

parents 47c05043 a3b10734

packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardPreviewClockViewBinder.kt

+2 −1
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import androidx.core.view.isVisible 
import androidx.lifecycle.Lifecycle

import androidx.lifecycle.repeatOnLifecycle

import com.android.app.tracing.coroutines.launch

import com.android.internal.policy.SystemBarUtils

import com.android.systemui.customization.R as customizationR

import com.android.systemui.keyguard.shared.model.SettingsClockSize

import com.android.systemui.keyguard.ui.preview.KeyguardPreviewRenderer
@@ -116,7 +117,7 @@ object KeyguardPreviewClockViewBinder { 
            constrainWidth(R.id.lockscreen_clock_view_large, ConstraintSet.WRAP_CONTENT)

            constrainHeight(R.id.lockscreen_clock_view_large, ConstraintSet.MATCH_CONSTRAINT)

            val largeClockTopMargin =

                context.resources.getDimensionPixelSize(R.dimen.status_bar_height) +

                SystemBarUtils.getStatusBarHeight(context) +

                    context.resources.getDimensionPixelSize(

                        customizationR.dimen.small_clock_padding_top

                    ) +

packages/SystemUI/src/com/android/systemui/keyguard/ui/preview/KeyguardPreviewRenderer.kt

+2 −1
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ import androidx.constraintlayout.widget.ConstraintSet.PARENT_ID 
import androidx.constraintlayout.widget.ConstraintSet.START

import androidx.constraintlayout.widget.ConstraintSet.TOP

import androidx.core.view.isInvisible

import com.android.internal.policy.SystemBarUtils

import com.android.keyguard.ClockEventController

import com.android.keyguard.KeyguardClockSwitch

import com.android.systemui.animation.view.LaunchableImageView
@@ -539,7 +540,7 @@ constructor( 
                    )

                )

            layoutParams.topMargin =

                KeyguardPreviewSmartspaceViewModel.getStatusBarHeight(resources) +

                SystemBarUtils.getStatusBarHeight(previewContext) +

                    resources.getDimensionPixelSize(

                        com.android.systemui.customization.R.dimen.small_clock_padding_top

                    )

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

+2 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.systemui.keyguard.ui.viewmodel 
import android.content.Context

import androidx.annotation.VisibleForTesting

import androidx.constraintlayout.helper.widget.Layer

import com.android.internal.policy.SystemBarUtils

import com.android.keyguard.KeyguardClockSwitch.LARGE

import com.android.keyguard.KeyguardClockSwitch.SMALL

import com.android.systemui.customization.R as customizationR
@@ -165,7 +166,7 @@ constructor( 


    companion object {

        fun getLargeClockTopMargin(context: Context): Int {

            return context.resources.getDimensionPixelSize(R.dimen.status_bar_height) +

            return SystemBarUtils.getStatusBarHeight(context) +

                context.resources.getDimensionPixelSize(

                    customizationR.dimen.small_clock_padding_top

                ) +

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

+0 −11
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.systemui.keyguard.ui.viewmodel



import android.content.Context

import android.content.res.Resources

import com.android.systemui.dagger.qualifiers.Application

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

import com.android.systemui.keyguard.shared.model.SettingsClockSize
@@ -89,14 +88,4 @@ constructor( 
            }

        }

    }

    companion object {

        fun getStatusBarHeight(resource: Resources): Int {

            var result = 0

            val resourceId: Int = resource.getIdentifier("status_bar_height", "dimen", "android")

            if (resourceId > 0) {

                result = resource.getDimensionPixelSize(resourceId)

            }

            return result

        }

    }

}

packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/view/layout/sections/ClockSectionTest.kt

+2 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.view.View.GONE 
import android.view.View.VISIBLE

import androidx.constraintlayout.widget.ConstraintSet

import androidx.test.filters.SmallTest

import com.android.internal.policy.SystemBarUtils

import com.android.systemui.SysuiTestCase

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

import com.android.systemui.keyguard.domain.interactor.KeyguardClockInteractor
@@ -70,7 +71,7 @@ class ClockSectionTest : SysuiTestCase() { 
            Utils.getStatusBarHeaderHeightKeyguard(context)



    private val LARGE_CLOCK_TOP_WITHOUT_SMARTSPACE =

        context.resources.getDimensionPixelSize(R.dimen.status_bar_height) +

        SystemBarUtils.getStatusBarHeight(context) +

            context.resources.getDimensionPixelSize(

                com.android.systemui.customization.R.dimen.small_clock_padding_top

            ) +