resolved conflicts for merge of 4d9f670b to stage-aosp-master (ba32c249) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/wifi/WifiConfigController.java

+21 −16

Original line number	Diff line number	Diff line
		@@ -50,10 +50,10 @@ import android.widget.ArrayAdapter;
		import android.widget.Button;
		import android.widget.CheckBox;
		import android.widget.CompoundButton;
		import android.widget.CompoundButton.OnCheckedChangeListener;
		import android.widget.EditText;
		import android.widget.Spinner;
		import android.widget.TextView;
		import android.widget.CompoundButton.OnCheckedChangeListener;

		import com.android.settings.ProxySelector;
		import com.android.settings.R;
		@@ -66,7 +66,7 @@ import java.util.Iterator;
		* share the logic for controlling buttons, text fields, etc.
		*/
		public class WifiConfigController implements TextWatcher,
		View.OnClickListener, AdapterView.OnItemSelectedListener {
		AdapterView.OnItemSelectedListener, OnCheckedChangeListener {
		private final WifiConfigUiBase mConfigUi;
		private final View mView;
		private final AccessPoint mAccessPoint;
		@@ -78,7 +78,6 @@ public class WifiConfigController implements TextWatcher,
		// e.g. AccessPoint.SECURITY_NONE
		private int mAccessPointSecurity;
		private TextView mPasswordView;
		private CheckBox mShowPassword;

		private String unspecifiedCert = "unspecified";
		private static final int unspecifiedCertIndex = 0;
		@@ -194,7 +193,9 @@ public class WifiConfigController implements TextWatcher,
		showIpConfigFields();
		showProxyFields();
		mView.findViewById(R.id.wifi_advanced_toggle).setVisibility(View.VISIBLE);
		mView.findViewById(R.id.wifi_advanced_togglebox).setOnClickListener(this);
		((CheckBox)mView.findViewById(R.id.wifi_advanced_togglebox))
		.setOnCheckedChangeListener(this);


		mConfigUi.setSubmitButton(context.getString(R.string.wifi_save));
		} else {
		@@ -248,7 +249,8 @@ public class WifiConfigController implements TextWatcher,
		showIpConfigFields();
		showProxyFields();
		mView.findViewById(R.id.wifi_advanced_toggle).setVisibility(View.VISIBLE);
		mView.findViewById(R.id.wifi_advanced_togglebox).setOnClickListener(this);
		((CheckBox)mView.findViewById(R.id.wifi_advanced_togglebox))
		.setOnCheckedChangeListener(this);
		if (showAdvancedFields) {
		((CheckBox)mView.findViewById(R.id.wifi_advanced_togglebox)).setChecked(true);
		mView.findViewById(R.id.wifi_advanced_fields).setVisibility(View.VISIBLE);
		@@ -558,13 +560,9 @@ public class WifiConfigController implements TextWatcher,
		if (mPasswordView == null) {
		mPasswordView = (TextView) mView.findViewById(R.id.password);
		mPasswordView.addTextChangedListener(this);
		mShowPassword = (CheckBox) mView.findViewById(R.id.show_password);
		mShowPassword.setOnClickListener(this);
		mShowPassword.setOnCheckedChangeListener(new OnCheckedChangeListener() {
		public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
		updatePasswordVisibility(isChecked);
		}
		});
		((CheckBox) mView.findViewById(R.id.show_password))
		.setOnCheckedChangeListener(this);

		if (mAccessPoint != null && mAccessPoint.networkId != INVALID_NETWORK_ID) {
		mPasswordView.setHint(R.string.wifi_unchanged);
		}
		@@ -872,11 +870,18 @@ public class WifiConfigController implements TextWatcher,
		}

		@Override
		public void onClick(View view) {
		public void onCheckedChanged(CompoundButton view, boolean isChecked) {
		if (view.getId() == R.id.show_password) {
		updatePasswordVisibility(((CheckBox) view).isChecked());
		int pos = mPasswordView.getSelectionEnd();
		mPasswordView.setInputType(
		InputType.TYPE_CLASS_TEXT \| (isChecked ?
		InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD :
		InputType.TYPE_TEXT_VARIATION_PASSWORD));
		if (pos >= 0) {
		((EditText)mPasswordView).setSelection(pos);
		}
		} else if (view.getId() == R.id.wifi_advanced_togglebox) {
		if (((CheckBox) view).isChecked()) {
		if (isChecked) {
		mView.findViewById(R.id.wifi_advanced_fields).setVisibility(View.VISIBLE);
		} else {
		mView.findViewById(R.id.wifi_advanced_fields).setVisibility(View.GONE);