From 8dd7d1cc80f009a4d76253b0dc9486ff262db712 Mon Sep 17 00:00:00 2001 From: chelseahao Date: Mon, 22 Jul 2024 14:17:11 +0800 Subject: [PATCH 1/3] Add accessibility label for "QR code" button in Audio sharing page. Test: atest Bug: 354112158 Flag: com.android.settingslib.flags.enable_le_audio_sharing Change-Id: I5d2e2c70ca76e3598ca3d9550ebcc140d3400e34 --- .../audiosharing/AudioSharingNamePreference.java | 2 ++ .../audiosharing/AudioSharingNamePreferenceTest.java | 1 + 2 files changed, 3 insertions(+) diff --git a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingNamePreference.java b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingNamePreference.java index bfccdc4c672..0a90e7b3c4a 100644 --- a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingNamePreference.java +++ b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingNamePreference.java @@ -92,6 +92,8 @@ public class AudioSharingNamePreference extends ValidatedEditTextPreference { shareButton.setVisibility(View.VISIBLE); shareButton.setImageDrawable(getContext().getDrawable(R.drawable.ic_qrcode_24dp)); shareButton.setOnClickListener(unused -> launchAudioSharingQrCodeFragment()); + shareButton.setContentDescription( + getContext().getString(R.string.audio_sharing_qrcode_button_label)); } private void configureInvisibleStateForQrCodeIcon(ImageButton shareButton, View divider) { diff --git a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingNamePreferenceTest.java b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingNamePreferenceTest.java index 13e2a9d4636..be62414253e 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingNamePreferenceTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingNamePreferenceTest.java @@ -117,6 +117,7 @@ public class AudioSharingNamePreferenceTest { assertThat(shareButton.getVisibility()).isEqualTo(View.VISIBLE); assertThat(shareButton.getDrawable()).isNotNull(); assertThat(shareButton.hasOnClickListeners()).isTrue(); + assertThat(shareButton.getContentDescription()).isNotNull(); assertThat(divider).isNotNull(); assertThat(divider.getVisibility()).isEqualTo(View.VISIBLE); From 7299e0f6bd312f01920e8d38004876ff184f9780 Mon Sep 17 00:00:00 2001 From: chelseahao Date: Mon, 22 Jul 2024 15:53:51 +0800 Subject: [PATCH 2/3] Add accessibility label for "QR code" image. Also added landscape mode. Test: atest Bug: 354116021 Flag: com.android.settingslib.flags.enable_le_audio_sharing Change-Id: Ide20e07f38660ef7f444fbe3b20d3364b9951e02 --- .../bluetooth_audio_streams_qr_code.xml | 62 +++++++++++++++++++ .../bluetooth_audio_streams_qr_code.xml | 4 +- res/values/strings.xml | 2 + .../AudioStreamsQrCodeFragment.java | 2 +- 4 files changed, 68 insertions(+), 2 deletions(-) create mode 100644 res/layout-land/bluetooth_audio_streams_qr_code.xml rename res/{xml => layout}/bluetooth_audio_streams_qr_code.xml (91%) diff --git a/res/layout-land/bluetooth_audio_streams_qr_code.xml b/res/layout-land/bluetooth_audio_streams_qr_code.xml new file mode 100644 index 00000000000..b35bc65f84f --- /dev/null +++ b/res/layout-land/bluetooth_audio_streams_qr_code.xml @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + + diff --git a/res/xml/bluetooth_audio_streams_qr_code.xml b/res/layout/bluetooth_audio_streams_qr_code.xml similarity index 91% rename from res/xml/bluetooth_audio_streams_qr_code.xml rename to res/layout/bluetooth_audio_streams_qr_code.xml index 5ec5505c4bb..fd521febc4a 100644 --- a/res/xml/bluetooth_audio_streams_qr_code.xml +++ b/res/layout/bluetooth_audio_streams_qr_code.xml @@ -47,7 +47,9 @@ + android:layout_height="@dimen/qrcode_size" + android:contentDescription="@string/audio_streams_qr_code_page_image_label" + android:focusable="true"/> Scan an audio stream QR code to listen with %1$s Can\u0027t edit password while sharing. To change the password, first turn off audio sharing. + + QR code diff --git a/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsQrCodeFragment.java b/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsQrCodeFragment.java index e4c07949b41..47f9c75514e 100644 --- a/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsQrCodeFragment.java +++ b/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsQrCodeFragment.java @@ -55,7 +55,7 @@ public class AudioStreamsQrCodeFragment extends InstrumentedFragment { @Override public final View onCreateView( LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - return inflater.inflate(R.xml.bluetooth_audio_streams_qr_code, container, false); + return inflater.inflate(R.layout.bluetooth_audio_streams_qr_code, container, false); } @Override From 467bb26083beb000f8400fa585eadcc2c7f6d60d Mon Sep 17 00:00:00 2001 From: chelseahao Date: Mon, 22 Jul 2024 16:58:58 +0800 Subject: [PATCH 3/3] Add accessibility label for "QR code" scanner. Also added landscape mode. Test: atest Bug: 354116021 Flag: com.android.settingslib.flags.enable_le_audio_sharing Change-Id: Ibb68252c5de5b30bdcbb9e9f88127b26e767ef04 --- res/layout-land/qrcode_scanner_fragment.xml | 74 +++++++++++++++++++++ res/layout/qrcode_scanner_fragment.xml | 4 +- res/values/strings.xml | 2 + 3 files changed, 79 insertions(+), 1 deletion(-) create mode 100644 res/layout-land/qrcode_scanner_fragment.xml diff --git a/res/layout-land/qrcode_scanner_fragment.xml b/res/layout-land/qrcode_scanner_fragment.xml new file mode 100644 index 00000000000..0e563e32f6c --- /dev/null +++ b/res/layout-land/qrcode_scanner_fragment.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/layout/qrcode_scanner_fragment.xml b/res/layout/qrcode_scanner_fragment.xml index 4f748c5fdf2..72049a4b2e7 100644 --- a/res/layout/qrcode_scanner_fragment.xml +++ b/res/layout/qrcode_scanner_fragment.xml @@ -55,7 +55,9 @@ android:layout_height="wrap_content" android:layout_gravity="top" android:gravity="center" - android:clipChildren="true"> + android:clipChildren="true" + android:contentDescription="@string/audio_streams_qr_code_scanner_label" + android:focusable="true"> Can\u0027t edit password while sharing. To change the password, first turn off audio sharing. QR code + + QR code scanner