diff --git a/res/values/strings.xml b/res/values/strings.xml index 83c3113e333..8b647dcf677 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -2185,8 +2185,6 @@ Scan this QR code to connect to \u201c%1$s\u201d and share the password Scan this QR code to connect to \u201c%1$s\u201d - - Couldn\u2019t read QR code. Re-center code and try again Try again. If the issue continues, contact the device manufacturer @@ -2231,6 +2229,8 @@ Add device Use a QR code to add a device to this network + + QR code isn\u0027t a valid format Retry diff --git a/src/com/android/settings/wifi/dpp/WifiDppAddDeviceFragment.java b/src/com/android/settings/wifi/dpp/WifiDppAddDeviceFragment.java index 4c4d0054204..06fccdeb581 100644 --- a/src/com/android/settings/wifi/dpp/WifiDppAddDeviceFragment.java +++ b/src/com/android/settings/wifi/dpp/WifiDppAddDeviceFragment.java @@ -101,7 +101,7 @@ public class WifiDppAddDeviceFragment extends WifiDppQrCodeBaseFragment { private void showErrorUi(int code, boolean isConfigurationChange) { switch (code) { case EasyConnectStatusCallback.EASY_CONNECT_EVENT_FAILURE_INVALID_URI: - mSummary.setText(R.string.wifi_dpp_could_not_detect_valid_qr_code); + mSummary.setText(R.string.wifi_dpp_qr_code_is_not_valid_format); break; case EasyConnectStatusCallback.EASY_CONNECT_EVENT_FAILURE_AUTHENTICATION: diff --git a/src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragment.java b/src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragment.java index 80167bacf3a..f87a4d70c58 100644 --- a/src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragment.java +++ b/src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragment.java @@ -433,14 +433,14 @@ public class WifiDppQrCodeScannerFragment extends WifiDppQrCodeBaseFragment impl try { mWifiQrCode = new WifiQrCode(qrCode); } catch (IllegalArgumentException e) { - showErrorMessage(R.string.wifi_dpp_could_not_detect_valid_qr_code); + showErrorMessage(R.string.wifi_dpp_qr_code_is_not_valid_format); return false; } // It's impossible to provision other device with ZXing Wi-Fi Network config format final String scheme = mWifiQrCode.getScheme(); if (mIsConfiguratorMode && WifiQrCode.SCHEME_ZXING_WIFI_NETWORK_CONFIG.equals(scheme)) { - showErrorMessage(R.string.wifi_dpp_could_not_detect_valid_qr_code); + showErrorMessage(R.string.wifi_dpp_qr_code_is_not_valid_format); return false; } @@ -564,7 +564,7 @@ public class WifiDppQrCodeScannerFragment extends WifiDppQrCodeBaseFragment impl int errorMessageResId = 0; switch (code) { case EasyConnectStatusCallback.EASY_CONNECT_EVENT_FAILURE_INVALID_URI: - errorMessageResId = R.string.wifi_dpp_could_not_detect_valid_qr_code; + errorMessageResId = R.string.wifi_dpp_qr_code_is_not_valid_format; break; case EasyConnectStatusCallback.EASY_CONNECT_EVENT_FAILURE_AUTHENTICATION: