diff options
16 files changed, 58 insertions, 24 deletions
diff --git a/packages/SystemUI/customization/res/values-sw600dp-land/dimens.xml b/packages/SystemUI/customization/res/values-sw600dp-land/dimens.xml index 651e401681c6..18073adf9e7a 100644 --- a/packages/SystemUI/customization/res/values-sw600dp-land/dimens.xml +++ b/packages/SystemUI/customization/res/values-sw600dp-land/dimens.xml @@ -16,4 +16,5 @@ <resources> <dimen name="keyguard_smartspace_top_offset">0dp</dimen> + <dimen name="status_view_margin_horizontal">8dp</dimen> </resources>
\ No newline at end of file diff --git a/packages/SystemUI/customization/res/values-sw600dp/dimens.xml b/packages/SystemUI/customization/res/values-sw600dp/dimens.xml index 10e630d44488..37cd590b979e 100644 --- a/packages/SystemUI/customization/res/values-sw600dp/dimens.xml +++ b/packages/SystemUI/customization/res/values-sw600dp/dimens.xml @@ -17,4 +17,5 @@ <resources> <!-- For portrait direction in unfold foldable device, we don't need keyguard_smartspace_top_offset--> <dimen name="keyguard_smartspace_top_offset">0dp</dimen> + <dimen name="status_view_margin_horizontal">62dp</dimen> </resources>
\ No newline at end of file diff --git a/packages/SystemUI/customization/res/values-sw720dp-land/dimens.xml b/packages/SystemUI/customization/res/values-sw720dp-land/dimens.xml new file mode 100644 index 000000000000..c1cf42c4b0f0 --- /dev/null +++ b/packages/SystemUI/customization/res/values-sw720dp-land/dimens.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?><!-- + ~ Copyright (C) 2024 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<resources> + <dimen name="status_view_margin_horizontal">24dp</dimen> +</resources>
\ No newline at end of file diff --git a/packages/SystemUI/customization/res/values-sw720dp-port/dimens.xml b/packages/SystemUI/customization/res/values-sw720dp-port/dimens.xml new file mode 100644 index 000000000000..54dbeaa1a3dd --- /dev/null +++ b/packages/SystemUI/customization/res/values-sw720dp-port/dimens.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?><!-- + ~ Copyright (C) 2024 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<resources> + <dimen name="status_view_margin_horizontal">124dp</dimen> +</resources>
\ No newline at end of file diff --git a/packages/SystemUI/customization/res/values/dimens.xml b/packages/SystemUI/customization/res/values/dimens.xml index 7feea6e5e8dd..041ae62670e5 100644 --- a/packages/SystemUI/customization/res/values/dimens.xml +++ b/packages/SystemUI/customization/res/values/dimens.xml @@ -39,4 +39,5 @@ <!--Dimens used in both lockscreen preview and smartspace --> <dimen name="date_weather_view_height">24dp</dimen> <dimen name="enhanced_smartspace_height">104dp</dimen> + <dimen name="status_view_margin_horizontal">0dp</dimen> </resources>
\ No newline at end of file diff --git a/packages/SystemUI/res/values-sw600dp-land/dimens.xml b/packages/SystemUI/res/values-sw600dp-land/dimens.xml index 4a53df9c2f29..75bee9f9266a 100644 --- a/packages/SystemUI/res/values-sw600dp-land/dimens.xml +++ b/packages/SystemUI/res/values-sw600dp-land/dimens.xml @@ -46,8 +46,6 @@ <dimen name="lockscreen_shade_max_over_scroll_amount">32dp</dimen> - <dimen name="status_view_margin_horizontal">8dp</dimen> - <!-- Lockscreen shade transition values --> <dimen name="lockscreen_shade_transition_by_tap_distance">200dp</dimen> <dimen name="lockscreen_shade_full_transition_distance">200dp</dimen> diff --git a/packages/SystemUI/res/values-sw600dp-port/dimens.xml b/packages/SystemUI/res/values-sw600dp-port/dimens.xml index 707bc9e535ff..f73e91af8aff 100644 --- a/packages/SystemUI/res/values-sw600dp-port/dimens.xml +++ b/packages/SystemUI/res/values-sw600dp-port/dimens.xml @@ -16,8 +16,6 @@ --> <resources> <dimen name="notification_panel_margin_horizontal">48dp</dimen> - <dimen name="status_view_margin_horizontal">62dp</dimen> - <!-- qs_tiles_page_horizontal_margin should be margin / 2, otherwise full space between two pages is margin * 2, and that makes tiles page not appear immediately after user swipes to the side --> diff --git a/packages/SystemUI/res/values-sw720dp-land/dimens.xml b/packages/SystemUI/res/values-sw720dp-land/dimens.xml index 8583f0549960..41bb37efa623 100644 --- a/packages/SystemUI/res/values-sw720dp-land/dimens.xml +++ b/packages/SystemUI/res/values-sw720dp-land/dimens.xml @@ -22,8 +22,6 @@ <dimen name="keyguard_split_shade_top_margin">72dp</dimen> - <dimen name="status_view_margin_horizontal">24dp</dimen> - <dimen name="qs_media_session_height_expanded">184dp</dimen> <dimen name="qs_content_horizontal_padding">40dp</dimen> <dimen name="qs_horizontal_margin">40dp</dimen> diff --git a/packages/SystemUI/res/values-sw720dp-port/dimens.xml b/packages/SystemUI/res/values-sw720dp-port/dimens.xml index 9248d585bba7..eb570b8f76d6 100644 --- a/packages/SystemUI/res/values-sw720dp-port/dimens.xml +++ b/packages/SystemUI/res/values-sw720dp-port/dimens.xml @@ -20,8 +20,6 @@ <!-- These resources are around just to allow their values to be customized for different hardware and product builds. --> <resources> - <dimen name="status_view_margin_horizontal">124dp</dimen> - <dimen name="large_screen_shade_header_left_padding">24dp</dimen> <dimen name="qqs_layout_padding_bottom">40dp</dimen> diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml index 22d6b09fb890..4954f9122788 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -1955,8 +1955,6 @@ <dimen name="dream_overlay_entry_y_offset">40dp</dimen> <dimen name="dream_overlay_exit_y_offset">40dp</dimen> - <dimen name="status_view_margin_horizontal">0dp</dimen> - <!-- Media output broadcast dialog QR code picture size --> <dimen name="media_output_qrcode_size">216dp</dimen> <dimen name="media_output_broadcast_info">21dp</dimen> diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardPreviewClockViewBinder.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardPreviewClockViewBinder.kt index 914fdd20e48e..6c03b2489380 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardPreviewClockViewBinder.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardPreviewClockViewBinder.kt @@ -151,7 +151,5 @@ object KeyguardPreviewClockViewBinder { cs.applyTo(rootView) } - private const val DATE_WEATHER_VIEW_HEIGHT = "date_weather_view_height" - private const val ENHANCED_SMARTSPACE_HEIGHT = "enhanced_smartspace_height" private const val TAG = "KeyguardPreviewClockViewBinder" } 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 08c3f153bc4e..4c23adfe92e8 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 @@ -29,6 +29,7 @@ import androidx.constraintlayout.widget.ConstraintSet.PARENT_ID import androidx.constraintlayout.widget.ConstraintSet.START import androidx.constraintlayout.widget.ConstraintSet.TOP import com.android.systemui.common.ui.ConfigurationState +import com.android.systemui.customization.R as customR import com.android.systemui.keyguard.MigrateClocksToBlueprint import com.android.systemui.keyguard.shared.model.KeyguardSection import com.android.systemui.keyguard.ui.viewmodel.KeyguardRootViewModel @@ -114,14 +115,14 @@ constructor( START, PARENT_ID, START, - context.resources.getDimensionPixelSize(R.dimen.status_view_margin_horizontal), + context.resources.getDimensionPixelSize(customR.dimen.status_view_margin_horizontal), ) connect( nicId, END, PARENT_ID, END, - context.resources.getDimensionPixelSize(R.dimen.status_view_margin_horizontal), + context.resources.getDimensionPixelSize(customR.dimen.status_view_margin_horizontal), ) constrainHeight( nicId, 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 c009720feaeb..6c98d5b01e4e 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 @@ -221,7 +221,9 @@ constructor( PARENT_ID, START, context.resources.getDimensionPixelSize(customR.dimen.clock_padding_start) + - context.resources.getDimensionPixelSize(R.dimen.status_view_margin_horizontal), + context.resources.getDimensionPixelSize( + customR.dimen.status_view_margin_horizontal + ), ) val smallClockTopMargin = keyguardClockViewModel.getSmallClockTopMargin() create(R.id.small_clock_guideline_top, ConstraintSet.HORIZONTAL_GUIDELINE) diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/SplitShadeMediaSection.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/SplitShadeMediaSection.kt index 0782846f52ae..f0d21f22c5ee 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/SplitShadeMediaSection.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/SplitShadeMediaSection.kt @@ -28,6 +28,7 @@ import androidx.constraintlayout.widget.ConstraintSet.MATCH_CONSTRAINT import androidx.constraintlayout.widget.ConstraintSet.PARENT_ID import androidx.constraintlayout.widget.ConstraintSet.START import androidx.constraintlayout.widget.ConstraintSet.TOP +import com.android.systemui.customization.R as customR import com.android.systemui.keyguard.MigrateClocksToBlueprint import com.android.systemui.keyguard.shared.model.KeyguardSection import com.android.systemui.media.controls.ui.controller.KeyguardMediaController @@ -42,7 +43,7 @@ class SplitShadeMediaSection constructor( @ShadeDisplayAware private val context: Context, private val notificationPanelView: NotificationPanelView, - private val keyguardMediaController: KeyguardMediaController + private val keyguardMediaController: KeyguardMediaController, ) : KeyguardSection() { private val mediaContainerId = R.id.status_view_media_container @@ -62,7 +63,7 @@ constructor( val horizontalPadding = padding + context.resources.getDimensionPixelSize( - R.dimen.status_view_margin_horizontal + customR.dimen.status_view_margin_horizontal ) setPaddingRelative(horizontalPadding, padding, horizontalPadding, padding) diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardSmartspaceViewModel.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardSmartspaceViewModel.kt index e30ddc69b19d..de0927ec27cb 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardSmartspaceViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardSmartspaceViewModel.kt @@ -17,6 +17,7 @@ package com.android.systemui.keyguard.ui.viewmodel import android.content.Context +import com.android.systemui.customization.R as customR import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.keyguard.domain.interactor.KeyguardSmartspaceInteractor @@ -59,10 +60,9 @@ constructor( /** Whether the weather area should be visible. */ val isWeatherVisible: StateFlow<Boolean> = - combine( + combine(isWeatherEnabled, keyguardClockViewModel.hasCustomWeatherDataDisplay) { isWeatherEnabled, - keyguardClockViewModel.hasCustomWeatherDataDisplay, - ) { isWeatherEnabled, clockIncludesCustomWeatherDisplay -> + clockIncludesCustomWeatherDisplay -> isWeatherVisible( clockIncludesCustomWeatherDisplay = clockIncludesCustomWeatherDisplay, isWeatherEnabled = isWeatherEnabled, @@ -76,7 +76,7 @@ constructor( clockIncludesCustomWeatherDisplay = keyguardClockViewModel.hasCustomWeatherDataDisplay.value, isWeatherEnabled = smartspaceInteractor.isWeatherEnabled.value, - ) + ), ) private fun isWeatherVisible( @@ -92,12 +92,12 @@ constructor( companion object { fun getSmartspaceStartMargin(context: Context): Int { return context.resources.getDimensionPixelSize(R.dimen.below_clock_padding_start) + - context.resources.getDimensionPixelSize(R.dimen.status_view_margin_horizontal) + context.resources.getDimensionPixelSize(customR.dimen.status_view_margin_horizontal) } fun getSmartspaceEndMargin(context: Context): Int { return context.resources.getDimensionPixelSize(R.dimen.below_clock_padding_end) + - context.resources.getDimensionPixelSize(R.dimen.status_view_margin_horizontal) + context.resources.getDimensionPixelSize(customR.dimen.status_view_margin_horizontal) } } } diff --git a/packages/SystemUI/src/com/android/systemui/shade/NotificationsQSContainerController.kt b/packages/SystemUI/src/com/android/systemui/shade/NotificationsQSContainerController.kt index 7a18d7caa13f..207439e1f374 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/NotificationsQSContainerController.kt +++ b/packages/SystemUI/src/com/android/systemui/shade/NotificationsQSContainerController.kt @@ -28,6 +28,7 @@ import androidx.constraintlayout.widget.ConstraintSet.START import androidx.constraintlayout.widget.ConstraintSet.TOP import androidx.lifecycle.lifecycleScope import com.android.app.tracing.coroutines.launchTraced as launch +import com.android.systemui.customization.R as customR import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.fragments.FragmentService @@ -314,7 +315,7 @@ constructor( private fun setKeyguardStatusViewConstraints(constraintSet: ConstraintSet) { val statusViewMarginHorizontal = - resources.getDimensionPixelSize(R.dimen.status_view_margin_horizontal) + resources.getDimensionPixelSize(customR.dimen.status_view_margin_horizontal) constraintSet.apply { setMargin(R.id.keyguard_status_view, START, statusViewMarginHorizontal) setMargin(R.id.keyguard_status_view, END, statusViewMarginHorizontal) |