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

Merge "Update strings for Wi-Fi DPP handshake running state"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-02-26 07:15:27 +00:00
committed by Android (Google) Code Review
parent a4819527b7 957ce7f7aa
commit 6dcb6a35c3
3 changed files with 35 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragment.java
View File

@@ -229,13 +229,7 @@ public class WifiDppQrCodeScannerFragment extends WifiDppQrCodeBaseFragment impl
} else {
mTitle.setText(R.string.wifi_dpp_scan_qr_code);
String description;
if (TextUtils.isEmpty(mSsid)) {
description = getString(R.string.wifi_dpp_scan_qr_code_join_unknown_network, mSsid);
} else {
description = getString(R.string.wifi_dpp_scan_qr_code_join_network, mSsid);
}
mSummary.setText(description);
updateEnrolleeSummary();
}
mErrorMessage = view.findViewById(R.id.error_message);
@@ -415,6 +409,7 @@ public class WifiDppQrCodeScannerFragment extends WifiDppQrCodeBaseFragment impl
if (!mIsConfiguratorMode) {
mProgressBar.setVisibility(View.VISIBLE);
startWifiDppEnrolleeInitiator((WifiQrCode)msg.obj);
updateEnrolleeSummary();
}
break;
@@ -461,6 +456,7 @@ public class WifiDppQrCodeScannerFragment extends WifiDppQrCodeBaseFragment impl
Log.e(TAG, "Invalid networkId " + newNetworkId);
mLatestStatusCode = EasyConnectStatusCallback.EASY_CONNECT_EVENT_FAILURE_GENERIC;
updateEnrolleeSummary();
mProgressBar.setVisibility(View.INVISIBLE);
showErrorMessage(getString(R.string.wifi_dpp_check_connection_try_again));
restartCamera();
@@ -528,6 +524,7 @@ public class WifiDppQrCodeScannerFragment extends WifiDppQrCodeBaseFragment impl
}
mLatestStatusCode = code;
updateEnrolleeSummary();
mProgressBar.setVisibility(View.INVISIBLE);
restartCamera();
}
@@ -588,4 +585,18 @@ public class WifiDppQrCodeScannerFragment extends WifiDppQrCodeBaseFragment impl
mCamera.start(surfaceTexture);
}
private void updateEnrolleeSummary() {
if (isGoingInitiator()) {
mSummary.setText(R.string.wifi_dpp_connecting);
} else {
String description;
if (TextUtils.isEmpty(mSsid)) {
description = getString(R.string.wifi_dpp_scan_qr_code_join_unknown_network, mSsid);
} else {
description = getString(R.string.wifi_dpp_scan_qr_code_join_network, mSsid);
}
mSummary.setText(description);
}
}
}