diff options
6 files changed, 26 insertions, 5 deletions
diff --git a/packages/SystemUI/res/layout/combined_qs_header.xml b/packages/SystemUI/res/layout/combined_qs_header.xml index 665c6127e06d..f3a6bbeaaf0e 100644 --- a/packages/SystemUI/res/layout/combined_qs_header.xml +++ b/packages/SystemUI/res/layout/combined_qs_header.xml @@ -121,10 +121,12 @@ frame when animating QS <-> QQS transition <LinearLayout android:id="@+id/shade_header_system_icons" android:layout_width="wrap_content" - app:layout_constraintHeight_min="@dimen/large_screen_shade_header_min_height" - android:layout_height="@dimen/large_screen_shade_header_min_height" + android:layout_height="@dimen/shade_header_system_icons_height" android:clickable="true" android:orientation="horizontal" + android:gravity="center_vertical" + android:paddingStart="@dimen/shade_header_system_icons_padding_start" + android:paddingEnd="@dimen/shade_header_system_icons_padding_end" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="@id/privacy_container" app:layout_constraintTop_toTopOf="@id/clock"> @@ -132,13 +134,13 @@ frame when animating QS <-> QQS transition <com.android.systemui.statusbar.phone.StatusIconContainer android:id="@+id/statusIcons" android:layout_width="wrap_content" - android:layout_height="match_parent" + android:layout_height="wrap_content" android:paddingEnd="@dimen/signal_cluster_battery_padding" /> <com.android.systemui.battery.BatteryMeterView android:id="@+id/batteryRemainingIcon" android:layout_width="wrap_content" - android:layout_height="match_parent" + android:layout_height="wrap_content" app:textAppearance="@style/TextAppearance.QS.Status" /> </LinearLayout> diff --git a/packages/SystemUI/res/values-sw600dp/dimens.xml b/packages/SystemUI/res/values-sw600dp/dimens.xml index 9a2db6bfdef6..83702eac7fdb 100644 --- a/packages/SystemUI/res/values-sw600dp/dimens.xml +++ b/packages/SystemUI/res/values-sw600dp/dimens.xml @@ -74,6 +74,9 @@ <dimen name="large_dialog_width">472dp</dimen> <dimen name="large_screen_shade_header_height">42dp</dimen> + <!-- start padding is smaller to account for status icon margins coming from drawable itself --> + <dimen name="shade_header_system_icons_padding_start">11dp</dimen> + <dimen name="shade_header_system_icons_padding_end">12dp</dimen> <!-- Lockscreen shade transition values --> <dimen name="lockscreen_shade_transition_by_tap_distance">200dp</dimen> diff --git a/packages/SystemUI/res/values-sw720dp/dimens.xml b/packages/SystemUI/res/values-sw720dp/dimens.xml index d053a7a0d0bb..ce545f44d9bd 100644 --- a/packages/SystemUI/res/values-sw720dp/dimens.xml +++ b/packages/SystemUI/res/values-sw720dp/dimens.xml @@ -27,6 +27,9 @@ <dimen name="large_screen_shade_header_height">56dp</dimen> + <!-- it's a bit smaller on 720dp to account for status_bar_icon_horizontal_margin --> + <dimen name="shade_header_system_icons_padding_start">10dp</dimen> + <!-- Biometric Auth pattern view size, better to align keyguard_security_width --> <dimen name="biometric_auth_pattern_view_size">348dp</dimen> </resources> diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml index 3bd7a0664d5a..b34b8f690fd5 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -470,6 +470,10 @@ <dimen name="large_screen_shade_header_height">48dp</dimen> <dimen name="large_screen_shade_header_min_height">@dimen/qs_header_row_min_height</dimen> <dimen name="large_screen_shade_header_left_padding">@dimen/qs_horizontal_margin</dimen> + <dimen name="shade_header_system_icons_height">@dimen/large_screen_shade_header_min_height</dimen> + <dimen name="shade_header_system_icons_height_large_screen">32dp</dimen> + <dimen name="shade_header_system_icons_padding_start">0dp</dimen> + <dimen name="shade_header_system_icons_padding_end">0dp</dimen> <!-- The top margin of the panel that holds the list of notifications. On phones it's always 0dp but it's overridden in Car UI diff --git a/packages/SystemUI/res/xml/large_screen_shade_header.xml b/packages/SystemUI/res/xml/large_screen_shade_header.xml index 39f4c81b6dbe..cb2c3a19a6d5 100644 --- a/packages/SystemUI/res/xml/large_screen_shade_header.xml +++ b/packages/SystemUI/res/xml/large_screen_shade_header.xml @@ -56,7 +56,7 @@ <Constraint android:id="@+id/shade_header_system_icons"> <Layout android:layout_width="wrap_content" - android:layout_height="@dimen/large_screen_shade_header_min_height" + android:layout_height="@dimen/shade_header_system_icons_height_large_screen" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/privacy_container" app:layout_constraintTop_toTopOf="parent" diff --git a/packages/SystemUI/src/com/android/systemui/shade/ShadeHeaderController.kt b/packages/SystemUI/src/com/android/systemui/shade/ShadeHeaderController.kt index 8789a8b3b7f4..4ac5cd8b18a7 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/ShadeHeaderController.kt +++ b/packages/SystemUI/src/com/android/systemui/shade/ShadeHeaderController.kt @@ -131,6 +131,7 @@ constructor( private val date: TextView = header.findViewById(R.id.date) private val iconContainer: StatusIconContainer = header.findViewById(R.id.statusIcons) private val mShadeCarrierGroup: ShadeCarrierGroup = header.findViewById(R.id.carrier_group) + private val systemIcons: View = header.findViewById(R.id.shade_header_system_icons) private var roundedCorners = 0 private var cutout: DisplayCutout? = null @@ -254,6 +255,14 @@ constructor( header.paddingRight, header.paddingBottom ) + systemIcons.setPaddingRelative( + resources.getDimensionPixelSize( + R.dimen.shade_header_system_icons_padding_start + ), + systemIcons.paddingTop, + resources.getDimensionPixelSize(R.dimen.shade_header_system_icons_padding_end), + systemIcons.paddingBottom + ) } override fun onDensityOrFontScaleChanged() { |