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

Merge "wifi: support SAE password identifier in wifi dialog"

Browse Source
This commit is contained in:
Jimmy Chen
2019-08-28 15:31:18 +00:00
committed by Android (Google) Code Review
parent cea963b4ab d79363fec6
commit 7157508edc
3 changed files with 49 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
res/layout/wifi_dialog.xml
View File

@@ -311,6 +311,25 @@
style="@style/wifi_item_content" style="@style/wifi_item_content"
android:text="@string/wifi_show_password" /> android:text="@string/wifi_show_password" />
</LinearLayout> </LinearLayout>
<LinearLayout android:id="@+id/sae_password_id_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/wifi_item"
android:visibility="gone">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/wifi_item_label"
android:text="@string/wifi_sae_password_id" />
<EditText android:id="@+id/sae_password_id"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/wifi_item_edit_content"
android:singleLine="true"
android:inputType="textNoSuggestions" />
</LinearLayout>
</LinearLayout> </LinearLayout>
<LinearLayout android:id="@+id/wifi_advanced_toggle" <LinearLayout android:id="@+id/wifi_advanced_toggle"

2
res/values/strings.xml
View File

@@ -2143,6 +2143,8 @@
<string name="wifi_eap_anonymous">Anonymous identity</string> <string name="wifi_eap_anonymous">Anonymous identity</string>
<!-- Label for the password of the secured network --> <!-- Label for the password of the secured network -->
<string name="wifi_password">Password</string> <string name="wifi_password">Password</string>
<!-- Label for the sae password id of the secured network [CHAR LIMIT=32] -->
<string name="wifi_sae_password_id">SAE password identifier</string>
<!-- Label for the check box to show password --> <!-- Label for the check box to show password -->
<string name="wifi_show_password">Show password</string> <string name="wifi_show_password">Show password</string>
<!-- Label for the RadioGroup to choose wifi ap band --> <!-- Label for the RadioGroup to choose wifi ap band -->

28
src/com/android/settings/wifi/WifiConfigController.java
View File

@@ -133,6 +133,7 @@ public class WifiConfigController implements TextWatcher,
@VisibleForTesting @VisibleForTesting
int mAccessPointSecurity; int mAccessPointSecurity;
private TextView mPasswordView; private TextView mPasswordView;
private TextView mSaePasswordIdView;
private ImageButton mSsidScanButton; private ImageButton mSsidScanButton;
private String mUnspecifiedCertString; private String mUnspecifiedCertString;
@@ -797,6 +798,11 @@ public class WifiConfigController implements TextWatcher,
String password = mPasswordView.getText().toString(); String password = mPasswordView.getText().toString();
config.preSharedKey = '"' + password + '"'; config.preSharedKey = '"' + password + '"';
} }
if (mSaePasswordIdView.length() != 0) {
config.saePasswordId = mSaePasswordIdView.getText().toString();
} else {
config.saePasswordId = null;
}
break; break;
case AccessPoint.SECURITY_OWE: case AccessPoint.SECURITY_OWE:
@@ -979,6 +985,23 @@ public class WifiConfigController implements TextWatcher,
} }
} }
if (mSaePasswordIdView == null) {
mSaePasswordIdView = (TextView) mView.findViewById(R.id.sae_password_id);
mSaePasswordIdView.setOnEditorActionListener(this);
mSaePasswordIdView.setOnKeyListener(this);
}
if (mAccessPointSecurity == AccessPoint.SECURITY_SAE) {
mView.findViewById(R.id.sae_password_id_layout).setVisibility(View.VISIBLE);
if (mAccessPoint != null && mAccessPoint.isSaved()) {
if (!TextUtils.isEmpty(mAccessPoint.getConfig().saePasswordId)) {
mSaePasswordIdView.setText(mAccessPoint.getConfig().saePasswordId);
}
}
} else {
setSaePasswordIdInvisible();
}
if (mAccessPointSecurity != AccessPoint.SECURITY_EAP && if (mAccessPointSecurity != AccessPoint.SECURITY_EAP &&
mAccessPointSecurity != AccessPoint.SECURITY_EAP_SUITE_B) { mAccessPointSecurity != AccessPoint.SECURITY_EAP_SUITE_B) {
mView.findViewById(R.id.eap).setVisibility(View.GONE); mView.findViewById(R.id.eap).setVisibility(View.GONE);
@@ -1260,6 +1283,11 @@ public class WifiConfigController implements TextWatcher,
mView.findViewById(R.id.show_password_layout).setVisibility(View.GONE); mView.findViewById(R.id.show_password_layout).setVisibility(View.GONE);
} }
private void setSaePasswordIdInvisible() {
mSaePasswordIdView.setText("");
mView.findViewById(R.id.sae_password_id_layout).setVisibility(View.GONE);
}
private void setEapMethodInvisible() { private void setEapMethodInvisible() {
mView.findViewById(R.id.eap).setVisibility(View.GONE); mView.findViewById(R.id.eap).setVisibility(View.GONE);
} }