Merge "Settings: Modify the dialog for carrier AP" (e95b6f8b) · Commits · e / os / android_packages_apps_Settings

res/values/bools.xml

+3 −0

Original line number	Diff line number	Diff line
		@@ -64,6 +64,9 @@

		<bool name="disable_data_sub2">false</bool>

		<!-- Whether to show abridged dialog connecting carrier AP -->
		<bool name="show_abridged_connecting_wifi_dialog">false</bool>

		<!-- Whether enable CABL service -->
		<bool name="cabl_enabled">false</bool>

+18 −0

Original line number	Diff line number	Diff line
		@@ -293,6 +293,13 @@ public class WifiConfigController implements TextWatcher,
		}
		}

		if (AccessPoint.CARRIER_SSID.equals(mAccessPoint.ssid)
		&& res.getBoolean(R.bool.show_abridged_connecting_wifi_dialog)) {
		if (mAccessPoint.security == AccessPoint.SECURITY_EAP) {
		mView.findViewById(R.id.wifi_advanced_toggle).setVisibility(View.GONE);
		}
		}

		if (mEdit) {
		mConfigUi.setSubmitButton(res.getString(R.string.wifi_save));
		} else {
		@@ -756,6 +763,17 @@ public class WifiConfigController implements TextWatcher,
		} else {
		showEapFieldsByMethod(mEapMethodSpinner.getSelectedItemPosition());
		}
		if (mAccessPoint != null && AccessPoint.CARRIER_SSID.equals(mAccessPoint.ssid)
		&& mContext.getResources().getBoolean(
		R.bool.show_abridged_connecting_wifi_dialog)) {
		if (mAccessPoint.security == AccessPoint.SECURITY_EAP) {
		mView.findViewById(R.id.l_method).setVisibility(View.GONE);
		setPhase2Invisible();
		setCaCertInvisible();
		setAnonymousIdentInvisible();
		setUserCertInvisible();
		}
		}
		}

		private void checkEapSimInfo() {