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

Commit 8811b07f authored by chelseahao's avatar chelseahao
Browse files

Fix color contrast and label for accessibility. 

Test: atest
Bug: b/379997234 , b/379988547 , b/379986527
Flag: EXEMPT bug fix
Change-Id: I00bc5990ab4c768b0cb424840fa3e6b212fcc9eb
parent 310f7b88

packages/SystemUI/res/layout/bluetooth_tile_dialog.xml

+4 −4
Original line number Diff line number Diff line
@@ -121,8 +121,8 @@ 
                android:contentDescription="@string/turn_on_bluetooth"

                android:switchMinWidth="@dimen/settingslib_switch_track_width"

                android:theme="@style/MainSwitch.Settingslib"

                android:thumb="@drawable/settingslib_thumb_selector"

                android:track="@drawable/settingslib_track_selector"

                android:thumb="@drawable/settingslib_switch_thumb"

                android:track="@drawable/settingslib_switch_track"

                app:layout_constraintEnd_toEndOf="parent"

                app:layout_constraintStart_toEndOf="@+id/bluetooth_toggle_title"

                app:layout_constraintTop_toTopOf="parent" />
@@ -163,8 +163,8 @@ 
                android:contentDescription="@string/turn_on_bluetooth_auto_tomorrow"

                android:switchMinWidth="@dimen/settingslib_switch_track_width"

                android:theme="@style/MainSwitch.Settingslib"

                android:thumb="@drawable/settingslib_thumb_selector"

                android:track="@drawable/settingslib_track_selector"

                android:thumb="@drawable/settingslib_switch_thumb"

                android:track="@drawable/settingslib_switch_track"

                app:layout_constraintEnd_toEndOf="parent"

                app:layout_constraintStart_toEndOf="@+id/bluetooth_auto_on_toggle_title"

                app:layout_constraintTop_toBottomOf="@+id/bluetooth_toggle" />

packages/SystemUI/res/values/strings.xml

+4 −3
Original line number Diff line number Diff line
@@ -574,11 +574,12 @@ 


    <!-- Content description of the bluetooth device settings gear icon. [CHAR LIMIT=NONE] -->

    <string name="accessibility_bluetooth_device_settings_gear">Click to configure device detail</string>

    <!-- Content description of the bluetooth device settings gear icon. [CHAR LIMIT=NONE] [BACKUP_MESSAGE_ID=3314916468105272540] -->

    <string name="accessibility_bluetooth_device_settings_gear_with_name"><xliff:g id="device_name">%s</xliff:g>. Configure device detail</string>

    <!-- Content description of the bluetooth device settings see all. [CHAR LIMIT=NONE] -->

    <string name="accessibility_bluetooth_device_settings_see_all">Click to see all devices</string>

    <string name="accessibility_bluetooth_device_settings_see_all">See all devices</string>

    <!-- Content description of the bluetooth device settings pair new device. [CHAR LIMIT=NONE] -->

    <string name="accessibility_bluetooth_device_settings_pair_new_device">Click to pair new device</string>



    <string name="accessibility_bluetooth_device_settings_pair_new_device">Pair new device</string>

    <!-- Content description of the battery when battery state is unknown for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->

    <string name="accessibility_battery_unknown">Battery percentage unknown.</string>

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

+5 −0
Original line number Diff line number Diff line
@@ -383,6 +383,11 @@ internal constructor( 


                    actionIcon.setImageResource(item.actionIconRes)

                    actionIcon.drawable?.setTint(tintColor)

                    actionIconView.contentDescription =

                        resources.getString(

                            R.string.accessibility_bluetooth_device_settings_gear_with_name,

                            item.deviceName,

                        )



                    divider.setBackgroundColor(tintColor)