PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[a11y] Set focus on "Pairing device" text once QR code is scanned. am: 2a85924977 am: 586eb5ed83

Browse Source 
Change-Id: Iab637847d5d43ab8e80dbe8b961625077698b209
This commit is contained in:
Joshua Duong
2020-04-07 18:15:19 +00:00
committed by Automerger Merge Worker
parent 08273a87f6 586eb5ed83
commit 7fe48efd12
3 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/layout/adb_qrcode_scanner_fragment.xml
View File

@@ -99,10 +99,12 @@
android:layout_height="wrap_content"/>
<TextView
android:id="@+id/verifying_textview"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/adb_wireless_item_progress_text"
android:text="@string/adb_wireless_verifying_qrcode_text"/>
android:text="@string/adb_wireless_verifying_qrcode_text"
android:accessibilityLiveRegion="polite"/>
</LinearLayout>

4
src/com/android/settings/development/AdbQrcodeScannerFragment.java
View File

@@ -73,6 +73,7 @@ public class AdbQrcodeScannerFragment extends WifiDppQrCodeBaseFragment implemen
private QrDecorateView mDecorateView;
private View mQrCameraView;
private View mVerifyingView;
private TextView mVerifyingTextView;
private TextView mErrorMessage;
/** QR code data scanned by camera */
@@ -168,6 +169,7 @@ public class AdbQrcodeScannerFragment extends WifiDppQrCodeBaseFragment implemen
mQrCameraView = view.findViewById(R.id.camera_layout);
mVerifyingView = view.findViewById(R.id.verifying_layout);
mVerifyingTextView = view.findViewById(R.id.verifying_textview);
setHeaderTitle(R.string.wifi_dpp_scan_qr_code);
mSummary.setText(R.string.adb_wireless_qrcode_pairing_description);
@@ -264,6 +266,8 @@ public class AdbQrcodeScannerFragment extends WifiDppQrCodeBaseFragment implemen
mDecorateView.setFocused(true);
mQrCameraView.setVisibility(View.GONE);
mVerifyingView.setVisibility(View.VISIBLE);
AdbQrCode.triggerVibrationForQrCodeRecognition(getContext());
mVerifyingTextView.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_FOCUSED);
try {
mAdbManager.enablePairingByQrCode(mAdbConfig.getSsid(),
mAdbConfig.getPreSharedKey());

10
src/com/android/settings/wifi/dpp/AdbQrCode.java
View File

@@ -15,6 +15,7 @@
*/
package com.android.settings.wifi.dpp;
import android.content.Context;
import android.text.TextUtils;
/**
@@ -53,4 +54,13 @@ public class AdbQrCode extends WifiQrCode {
public WifiNetworkConfig getAdbNetworkConfig() {
return mAdbConfig;
}
/**
* Triggers a vibration to notify of a valid QR code.
*
* @param context The context to use
*/
public static void triggerVibrationForQrCodeRecognition(Context context) {
WifiDppUtils.triggerVibrationForQrCodeRecognition(context);
}
}