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

Commit 3924a6ed authored by Sherry Zhou's avatar Sherry Zhou
Browse files

Fix clock/smartspace horizontal padding for Felix/Tangor portrait 

Flag: ACONFIG com.android.systemui.migrate_clocks_to_blueprint DEVELOPMENT
Test: manual
Bug: 322208197

Change-Id: I783dd3d264c7474aff2173f751c9295a8fb31db5
parent d6bdc801

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

+14 −2
Original line number Diff line number Diff line
@@ -120,8 +120,20 @@ constructor( 
            } else {

                connect(nicId, TOP, R.id.keyguard_status_view, topAlignment, bottomMargin)

            }

            connect(nicId, START, PARENT_ID, START)

            connect(nicId, END, PARENT_ID, END)

            connect(

                nicId,

                START,

                PARENT_ID,

                START,

                context.resources.getDimensionPixelSize(R.dimen.status_view_margin_horizontal)

            )

            connect(

                nicId,

                END,

                PARENT_ID,

                END,

                context.resources.getDimensionPixelSize(R.dimen.status_view_margin_horizontal)

            )

            constrainHeight(

                nicId,

                context.resources.getDimensionPixelSize(R.dimen.notification_shelf_height)

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

+7 −13
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import androidx.constraintlayout.widget.ConstraintSet.TOP 
import androidx.constraintlayout.widget.ConstraintSet.VISIBLE

import androidx.constraintlayout.widget.ConstraintSet.WRAP_CONTENT

import com.android.systemui.Flags

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

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

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

import com.android.systemui.keyguard.shared.model.KeyguardSection
@@ -160,16 +161,14 @@ constructor( 
            var largeClockTopMargin =

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

                    context.resources.getDimensionPixelSize(

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

                        customizationR.dimen.small_clock_padding_top

                    ) +

                    context.resources.getDimensionPixelSize(R.dimen.keyguard_smartspace_top_offset)

            largeClockTopMargin += getDimen(DATE_WEATHER_VIEW_HEIGHT)

            largeClockTopMargin += getDimen(ENHANCED_SMARTSPACE_HEIGHT)

            if (!keyguardClockViewModel.useLargeClock) {

                largeClockTopMargin -=

                    context.resources.getDimensionPixelSize(

                        com.android.systemui.customization.R.dimen.small_clock_height

                    )

                    context.resources.getDimensionPixelSize(customizationR.dimen.small_clock_height)

            }

            connect(R.id.lockscreen_clock_view_large, TOP, PARENT_ID, TOP, largeClockTopMargin)

            constrainHeight(R.id.lockscreen_clock_view_large, WRAP_CONTENT)
@@ -177,18 +176,15 @@ constructor( 
            constrainWidth(R.id.lockscreen_clock_view, WRAP_CONTENT)

            constrainHeight(

                R.id.lockscreen_clock_view,

                context.resources.getDimensionPixelSize(

                    com.android.systemui.customization.R.dimen.small_clock_height

                )

                context.resources.getDimensionPixelSize(customizationR.dimen.small_clock_height)

            )

            connect(

                R.id.lockscreen_clock_view,

                START,

                PARENT_ID,

                START,

                context.resources.getDimensionPixelSize(

                    com.android.systemui.customization.R.dimen.clock_padding_start

                )

                context.resources.getDimensionPixelSize(customizationR.dimen.clock_padding_start) +

                    context.resources.getDimensionPixelSize(R.dimen.status_view_margin_horizontal)

            )

            var smallClockTopMargin =

                if (splitShadeStateController.shouldUseSplitNotificationShade(context.resources)) {
@@ -199,9 +195,7 @@ constructor( 
                }

            if (keyguardClockViewModel.useLargeClock) {

                smallClockTopMargin -=

                    context.resources.getDimensionPixelSize(

                        com.android.systemui.customization.R.dimen.small_clock_height

                    )

                    context.resources.getDimensionPixelSize(customizationR.dimen.small_clock_height)

            }

            connect(R.id.lockscreen_clock_view, TOP, PARENT_ID, TOP, smallClockTopMargin)

        }

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

+0 −2
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
package com.android.systemui.keyguard.ui.view.layout.sections



import android.content.Context

import android.view.View

import androidx.constraintlayout.widget.ConstraintSet

import androidx.constraintlayout.widget.ConstraintSet.BOTTOM

import androidx.constraintlayout.widget.ConstraintSet.END
@@ -67,7 +66,6 @@ constructor( 
        notificationStackSizeCalculator,

        mainDispatcher,

    ) {

    private val smartSpaceBarrier = View.generateViewId()

    override fun applyConstraints(constraintSet: ConstraintSet) {

        if (!KeyguardShadeMigrationNssl.isEnabled) {

            return

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

+39 −38
Original line number Diff line number Diff line
@@ -31,7 +31,8 @@ import com.android.systemui.keyguard.shared.model.KeyguardSection 
import com.android.systemui.keyguard.ui.binder.KeyguardSmartspaceViewBinder

import com.android.systemui.keyguard.ui.viewmodel.KeyguardClockViewModel

import com.android.systemui.keyguard.ui.viewmodel.KeyguardSmartspaceViewModel

import com.android.systemui.shared.R

import com.android.systemui.res.R as R

import com.android.systemui.shared.R as sharedR

import com.android.systemui.statusbar.lockscreen.LockscreenSmartspaceController

import dagger.Lazy

import javax.inject.Inject
@@ -100,94 +101,94 @@ constructor( 
        if (!migrateClocksToBlueprint()) {

            return

        }

        val horizontalPaddingStart =

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

                context.resources.getDimensionPixelSize(R.dimen.status_view_margin_horizontal)

        val horizontalPaddingEnd =

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

                context.resources.getDimensionPixelSize(R.dimen.status_view_margin_horizontal)

        constraintSet.apply {

            // migrate addDateWeatherView, addWeatherView from KeyguardClockSwitchController

            constrainHeight(R.id.date_smartspace_view, ConstraintSet.WRAP_CONTENT)

            constrainWidth(R.id.date_smartspace_view, ConstraintSet.WRAP_CONTENT)

            constrainHeight(sharedR.id.date_smartspace_view, ConstraintSet.WRAP_CONTENT)

            constrainWidth(sharedR.id.date_smartspace_view, ConstraintSet.WRAP_CONTENT)

            connect(

                R.id.date_smartspace_view,

                sharedR.id.date_smartspace_view,

                ConstraintSet.START,

                ConstraintSet.PARENT_ID,

                ConstraintSet.START,

                context.resources.getDimensionPixelSize(

                    com.android.systemui.res.R.dimen.below_clock_padding_start

                horizontalPaddingStart

            )

            )

            constrainWidth(R.id.weather_smartspace_view, ConstraintSet.WRAP_CONTENT)

            constrainWidth(sharedR.id.weather_smartspace_view, ConstraintSet.WRAP_CONTENT)

            connect(

                R.id.weather_smartspace_view,

                sharedR.id.weather_smartspace_view,

                ConstraintSet.TOP,

                R.id.date_smartspace_view,

                sharedR.id.date_smartspace_view,

                ConstraintSet.TOP

            )

            connect(

                R.id.weather_smartspace_view,

                sharedR.id.weather_smartspace_view,

                ConstraintSet.BOTTOM,

                R.id.date_smartspace_view,

                sharedR.id.date_smartspace_view,

                ConstraintSet.BOTTOM

            )

            connect(

                R.id.weather_smartspace_view,

                sharedR.id.weather_smartspace_view,

                ConstraintSet.START,

                R.id.date_smartspace_view,

                sharedR.id.date_smartspace_view,

                ConstraintSet.END,

                4

            )



            // migrate addSmartspaceView from KeyguardClockSwitchController

            constrainHeight(R.id.bc_smartspace_view, ConstraintSet.WRAP_CONTENT)

            constrainHeight(sharedR.id.bc_smartspace_view, ConstraintSet.WRAP_CONTENT)

            connect(

                R.id.bc_smartspace_view,

                sharedR.id.bc_smartspace_view,

                ConstraintSet.START,

                ConstraintSet.PARENT_ID,

                ConstraintSet.START,

                context.resources.getDimensionPixelSize(

                    com.android.systemui.res.R.dimen.below_clock_padding_start

                )

                horizontalPaddingStart

            )

            connect(

                R.id.bc_smartspace_view,

                sharedR.id.bc_smartspace_view,

                ConstraintSet.END,

                if (keyguardClockViewModel.clockShouldBeCentered.value) ConstraintSet.PARENT_ID

                else com.android.systemui.res.R.id.split_shade_guideline,

                else R.id.split_shade_guideline,

                ConstraintSet.END,

                context.resources.getDimensionPixelSize(

                    com.android.systemui.res.R.dimen.below_clock_padding_end

                )

                horizontalPaddingEnd

            )



            if (keyguardClockViewModel.hasCustomWeatherDataDisplay.value) {

                clear(R.id.date_smartspace_view, ConstraintSet.TOP)

                clear(sharedR.id.date_smartspace_view, ConstraintSet.TOP)

                connect(

                    R.id.date_smartspace_view,

                    sharedR.id.date_smartspace_view,

                    ConstraintSet.BOTTOM,

                    R.id.bc_smartspace_view,

                    sharedR.id.bc_smartspace_view,

                    ConstraintSet.TOP

                )

            } else {

                clear(R.id.date_smartspace_view, ConstraintSet.BOTTOM)

                clear(sharedR.id.date_smartspace_view, ConstraintSet.BOTTOM)

                connect(

                    R.id.date_smartspace_view,

                    sharedR.id.date_smartspace_view,

                    ConstraintSet.TOP,

                    com.android.systemui.res.R.id.lockscreen_clock_view,

                    R.id.lockscreen_clock_view,

                    ConstraintSet.BOTTOM

                )

                connect(

                    R.id.bc_smartspace_view,

                    sharedR.id.bc_smartspace_view,

                    ConstraintSet.TOP,

                    R.id.date_smartspace_view,

                    sharedR.id.date_smartspace_view,

                    ConstraintSet.BOTTOM

                )

            }



            createBarrier(

                com.android.systemui.res.R.id.smart_space_barrier_bottom,

                R.id.smart_space_barrier_bottom,

                Barrier.BOTTOM,

                0,

                *intArrayOf(

                    R.id.bc_smartspace_view,

                    R.id.date_smartspace_view,

                    R.id.weather_smartspace_view,

                    sharedR.id.bc_smartspace_view,

                    sharedR.id.date_smartspace_view,

                    sharedR.id.weather_smartspace_view,

                )

            )

        }
@@ -212,7 +213,7 @@ constructor( 
    private fun updateVisibility(constraintSet: ConstraintSet) {

        constraintSet.apply {

            setVisibility(

                R.id.weather_smartspace_view,

                sharedR.id.weather_smartspace_view,

                when (keyguardClockViewModel.hasCustomWeatherDataDisplay.value) {

                    true -> ConstraintSet.GONE

                    false ->
@@ -223,7 +224,7 @@ constructor( 
                }

            )

            setVisibility(

                R.id.date_smartspace_view,

                sharedR.id.date_smartspace_view,

                if (keyguardClockViewModel.hasCustomWeatherDataDisplay.value) ConstraintSet.GONE

                else ConstraintSet.VISIBLE

            )