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

Merge "Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release' into master_merge Fix build in DevelopmentSettings.java"

Browse Source
This commit is contained in:
Prerepa Viswanadham
2015-03-25 19:59:48 +00:00
committed by Android (Google) Code Review
parent 85d9e16cc1 77eb8880e8
commit 9d2ebc3cf0
8 changed files with 88 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/wifi/WifiApDialog.java
View File

@@ -184,6 +184,15 @@ public class WifiApDialog extends AlertDialog implements View.OnClickListener,
validate();
}
public void onRestoreInstanceState(Bundle savedInstanceState) {
super.onRestoreInstanceState(savedInstanceState);
mPassword.setInputType(
InputType.TYPE_CLASS_TEXT |
(((CheckBox) mView.findViewById(R.id.show_password)).isChecked() ?
InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD :
InputType.TYPE_TEXT_VARIATION_PASSWORD));
}
private void validate() {
if ((mSsid != null && mSsid.length() == 0) ||
((mSecurityTypeIndex == WPA2_INDEX)&&

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

@@ -971,14 +971,12 @@ public class WifiConfigController implements TextWatcher,
/**
* Make the characters of the password visible if show_password is checked.
*/
private void updatePasswordVisibility(boolean checked) {
int pos = mPasswordView.getSelectionEnd();
mPasswordView.setInputType(
InputType.TYPE_CLASS_TEXT | (checked ?
InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD :
InputType.TYPE_TEXT_VARIATION_PASSWORD));
if (pos >= 0) {
((EditText)mPasswordView).setSelection(pos);
}
public void updatePassword() {
TextView passwdView = (TextView) mView.findViewById(R.id.password);
passwdView.setInputType(
InputType.TYPE_CLASS_TEXT |
(((CheckBox) mView.findViewById(R.id.show_password)).isChecked() ?
InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD :
InputType.TYPE_TEXT_VARIATION_PASSWORD));
}
}

5
src/com/android/settings/wifi/WifiDialog.java
View File

@@ -75,6 +75,11 @@ class WifiDialog extends AlertDialog implements WifiConfigUiBase {
}
}
public void onRestoreInstanceState(Bundle savedInstanceState) {
super.onRestoreInstanceState(savedInstanceState);
mController.updatePassword();
}
@Override
public boolean isEdit() {
return mEdit;