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

Commit 4913df48 authored by Chelsea Hao's avatar Chelsea Hao Committed by Android (Google) Code Review
Browse files

Merge "Add divider to device items in bt tile dialog." into main

parents 5a99de07 d9402d97

packages/SystemUI/res/layout/bluetooth_device_item.xml

+12 −1
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 
        android:textDirection="locale"

        android:textAlignment="gravity"

        android:paddingStart="20dp"

        android:paddingEnd="10dp"

        android:paddingTop="15dp"

        android:maxLines="1"

        android:ellipsize="end"
@@ -56,6 +57,7 @@ 
        android:id="@+id/bluetooth_device_summary"

        style="@style/BluetoothTileDialog.DeviceSummary"

        android:paddingStart="20dp"

        android:paddingEnd="10dp"

        android:paddingBottom="15dp"

        android:maxLines="1"

        android:ellipsize="end"
@@ -72,12 +74,21 @@ 
        app:layout_constraintGuide_percent="0.8"

        android:orientation="vertical"/>



    <View

        android:id="@+id/divider"

        android:layout_width="1dp"

        android:layout_height="38dp"

        app:layout_constraintStart_toEndOf="@+id/guideline"

        app:layout_constraintEnd_toStartOf="@+id/gear_icon"

        app:layout_constraintTop_toTopOf="parent"

        app:layout_constraintBottom_toBottomOf="parent" />



    <View

        android:id="@+id/gear_icon"

        android:layout_width="0dp"

        android:layout_height="0dp"

        android:contentDescription="@string/accessibility_bluetooth_device_settings_gear"

        app:layout_constraintStart_toEndOf="@+id/guideline"

        app:layout_constraintStart_toEndOf="@+id/divider"

        app:layout_constraintEnd_toEndOf="parent"

        app:layout_constraintTop_toTopOf="parent"

        app:layout_constraintBottom_toBottomOf="parent" />

packages/SystemUI/src/com/android/systemui/bluetooth/qsdialog/BluetoothTileDialogDelegate.kt

+3 −0
Original line number Diff line number Diff line
@@ -372,6 +372,7 @@ internal constructor( 
            private val iconView = view.requireViewById<ImageView>(R.id.bluetooth_device_icon)

            private val iconGear = view.requireViewById<ImageView>(R.id.gear_icon_image)

            private val gearView = view.requireViewById<View>(R.id.gear_icon)

            private val divider = view.requireViewById<View>(R.id.divider)



            internal fun bind(

                item: DeviceItem,
@@ -404,6 +405,8 @@ internal constructor( 


                    iconGear.apply { drawable?.let { it.mutate()?.setTint(tintColor) } }



                    divider.setBackgroundColor(tintColor)



                    // update text styles

                    nameView.setTextAppearance(

                        if (item.isActive) R.style.BluetoothTileDialog_DeviceName_Active