1 files changed, 1 insertions, 23 deletions

diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java
index a5d076575..e244b7fb1 100644
--- a/src/com/android/settings/wifi/WifiConfigController.java
+++ b/src/com/android/settings/wifi/WifiConfigController.java
@@ -99,9 +99,6 @@ public class WifiConfigController implements TextWatcher,
     /* Full list of phase2 methods */
     private final ArrayAdapter<String> PHASE2_FULL_ADAPTER;
 
-    // True when this instance is used in SetupWizard XL context.
-    private final boolean mInXlSetupWizard;
-
     private final Handler mTextViewChangedHandler;
 
     // e.g. AccessPoint.SECURITY_NONE
@@ -148,7 +145,6 @@ public class WifiConfigController implements TextWatcher,
     public WifiConfigController(
             WifiConfigUiBase parent, View view, AccessPoint accessPoint, boolean edit) {
         mConfigUi = parent;
-        mInXlSetupWizard = (parent instanceof WifiConfigUiForSetupWizardXL);
 
         mView = view;
         mAccessPoint = accessPoint;
@@ -184,18 +180,7 @@ public class WifiConfigController implements TextWatcher,
             mSsidView.addTextChangedListener(this);
             mSecuritySpinner = ((Spinner) mView.findViewById(R.id.security));
             mSecuritySpinner.setOnItemSelectedListener(this);
-            if (mInXlSetupWizard) {
-                mView.findViewById(R.id.type_ssid).setVisibility(View.VISIBLE);
-                mView.findViewById(R.id.type_security).setVisibility(View.VISIBLE);
-                // We want custom layout. The content must be same as the other cases.
-
-                ArrayAdapter<String> adapter = new ArrayAdapter<String>(mContext,
-                        R.layout.wifi_setup_custom_list_item_1, android.R.id.text1,
-                        res.getStringArray(R.array.wifi_security_no_eap));
-                mSecuritySpinner.setAdapter(adapter);
-            } else {
-                mView.findViewById(R.id.type).setVisibility(View.VISIBLE);
-            }
+            mView.findViewById(R.id.type).setVisibility(View.VISIBLE);
 
             showIpConfigFields();
             showProxyFields();
@@ -605,13 +590,6 @@ public class WifiConfigController implements TextWatcher,
     }
 
     private void showSecurityFields() {
-        if (mInXlSetupWizard) {
-            // Note: XL SetupWizard won't hide "EAP" settings here.
-            if (!((WifiSettingsForSetupWizardXL)mConfigUi.getContext()).initSecurityFields(mView,
-                        mAccessPointSecurity)) {
-                return;
-            }
-        }
         if (mAccessPointSecurity == AccessPoint.SECURITY_NONE) {
             mView.findViewById(R.id.security_fields).setVisibility(View.GONE);
             return;