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

am 0a4ab1ea: Disable Save of empty-named AP.

Browse Source 
Merge commit '0a4ab1eab20d5492bf7c87e348fd26d6c56889b9' into eclair-mr2-plus-aosp

* commit '0a4ab1eab20d5492bf7c87e348fd26d6c56889b9':
  Disable Save of empty-named AP.
This commit is contained in:
Robert Greenwalt
2009-10-26 14:28:23 -07:00
committed by Android Git Automerger
parent 32ac210016 0a4ab1eab2
commit 3f370d8ef8
1 changed files with 36 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/com/android/settings/wifi/AccessPointDialog.java
View File

@@ -28,8 +28,10 @@ import android.security.KeyStore;
import android.net.wifi.WifiInfo; import android.net.wifi.WifiInfo;
import android.net.wifi.WifiManager; import android.net.wifi.WifiManager;
import android.os.Bundle; import android.os.Bundle;
import android.text.Editable;
import android.text.InputType; import android.text.InputType;
import android.text.TextUtils; import android.text.TextUtils;
import android.text.TextWatcher;
import android.text.format.Formatter; import android.text.format.Formatter;
import android.text.method.PasswordTransformationMethod; import android.text.method.PasswordTransformationMethod;
import android.text.method.TransformationMethod; import android.text.method.TransformationMethod;
@@ -38,6 +40,7 @@ import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.AdapterView; import android.widget.AdapterView;
import android.widget.ArrayAdapter; import android.widget.ArrayAdapter;
import android.widget.Button;
import android.widget.CheckBox; import android.widget.CheckBox;
import android.widget.EditText; import android.widget.EditText;
import android.widget.Spinner; import android.widget.Spinner;
@@ -143,8 +146,32 @@ public class AccessPointDialog extends AlertDialog implements DialogInterface.On
onFill(); onFill();
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
if (mMode == MODE_CONFIGURE) {
Button saveButton = getButton(mSaveButtonPos);
saveButton.setEnabled(false);
saveButton.setFocusable(false);
}
} }
private final TextWatcher mSsidEditorWatcher = new TextWatcher() {
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
}
public void onTextChanged(CharSequence s, int start, int before, int count) {
if (mSaveButtonPos != Integer.MAX_VALUE) {
boolean enable = true;
if (s.length() == 0) {
enable = false;
}
Button saveButton = getButton(mSaveButtonPos);
saveButton.setEnabled(enable);
saveButton.setFocusable(enable);
}
}
public void afterTextChanged(Editable s) {
}
};
@Override @Override
public void onRestoreInstanceState(Bundle savedInstanceState) { public void onRestoreInstanceState(Bundle savedInstanceState) {
// Set to a class loader that can find AccessPointState // Set to a class loader that can find AccessPointState
@@ -291,6 +318,7 @@ public class AccessPointDialog extends AlertDialog implements DialogInterface.On
} }
setButtons(positiveButtonResId, negativeButtonResId, neutralButtonResId); setButtons(positiveButtonResId, negativeButtonResId, neutralButtonResId);
} }
/** Called when we need to set our member variables to point to the views. */ /** Called when we need to set our member variables to point to the views. */
@@ -299,6 +327,9 @@ public class AccessPointDialog extends AlertDialog implements DialogInterface.On
mPasswordEdit = (EditText) view.findViewById(R.id.password_edit); mPasswordEdit = (EditText) view.findViewById(R.id.password_edit);
mSsidText = (TextView) view.findViewById(R.id.ssid_text); mSsidText = (TextView) view.findViewById(R.id.ssid_text);
mSsidEdit = (EditText) view.findViewById(R.id.ssid_edit); mSsidEdit = (EditText) view.findViewById(R.id.ssid_edit);
if (mSsidEdit != null) {
mSsidEdit.addTextChangedListener(mSsidEditorWatcher);
}
mSecurityText = (TextView) view.findViewById(R.id.security_text); mSecurityText = (TextView) view.findViewById(R.id.security_text);
mSecuritySpinner = (Spinner) view.findViewById(R.id.security_spinner); mSecuritySpinner = (Spinner) view.findViewById(R.id.security_spinner);
mWepTypeSpinner = (Spinner) view.findViewById(R.id.wep_type_spinner); mWepTypeSpinner = (Spinner) view.findViewById(R.id.wep_type_spinner);