diff options
4 files changed, 60 insertions, 55 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/AodNotificationIconsSection.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/AodNotificationIconsSection.kt index bc6c7cbf35fb..ad589dfcff9e 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/AodNotificationIconsSection.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/AodNotificationIconsSection.kt @@ -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) diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/ClockSection.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/ClockSection.kt index a1b3f270f642..fe4f07d022dd 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/ClockSection.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/ClockSection.kt @@ -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) } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/DefaultNotificationStackScrollLayoutSection.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/DefaultNotificationStackScrollLayoutSection.kt index 8c5e9b4c6817..d75a72f91061 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/DefaultNotificationStackScrollLayoutSection.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/DefaultNotificationStackScrollLayoutSection.kt @@ -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 diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/SmartspaceSection.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/SmartspaceSection.kt index 37842a84c3d3..2f99719df36c 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/SmartspaceSection.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/SmartspaceSection.kt @@ -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 ) |