diff options
Diffstat (limited to 'src/com/android/settings/wifi')
| -rw-r--r-- | src/com/android/settings/wifi/WifiSettings.java | 26 | ||||
| -rw-r--r-- | src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java | 13 |
2 files changed, 27 insertions, 12 deletions
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java index 3a1f767..510292a 100644 --- a/src/com/android/settings/wifi/WifiSettings.java +++ b/src/com/android/settings/wifi/WifiSettings.java @@ -49,10 +49,12 @@ import android.security.Credentials; import android.security.KeyStore; import android.view.ContextMenu; import android.view.ContextMenu.ContextMenuInfo; +import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; +import android.view.ViewGroup; import android.widget.AdapterView.AdapterContextMenuInfo; import android.widget.Toast; @@ -107,11 +109,6 @@ public class WifiSettings extends SettingsPreferenceFragment // this boolean extra specifies whether to disable the Next button when not connected private static final String EXTRA_ENABLE_NEXT_ON_CONNECT = "wifi_enable_next_on_connect"; - // Indicates that this fragment is used as a part of Setup Wizard with XL screen settings. - // This fragment should show information which has been shown as Dialog in combined UI - // inside this fragment. - /* package */ static final String IN_XL_SETUP_WIZARD = "in_setup_wizard"; - // should Next button only be enabled when we have a connection? private boolean mEnableNextOnConnection; private boolean mInXlSetupWizard; @@ -140,6 +137,23 @@ public class WifiSettings extends SettingsPreferenceFragment } @Override + public void onAttach(Activity activity) { + super.onAttach(activity); + + mInXlSetupWizard = (activity instanceof WifiSettingsForSetupWizardXL); + } + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + if (mInXlSetupWizard) { + return inflater.inflate(R.layout.custom_preference_list_fragment, container, false); + } else { + return super.onCreateView(inflater, container, savedInstanceState); + } + } + + @Override public void onActivityCreated(Bundle savedInstanceState) { // We don't call super.onActivityCreated() here, since it assumes we already set up // Preference (probably in onCreate()), while WifiSettings exceptionally set it up in @@ -150,11 +164,9 @@ public class WifiSettings extends SettingsPreferenceFragment final Activity activity = getActivity(); final Intent intent = activity.getIntent(); - // if we're supposed to enable/disable the Next button based on our current connection // state, start it off in the right state mEnableNextOnConnection = intent.getBooleanExtra(EXTRA_ENABLE_NEXT_ON_CONNECT, false); - mInXlSetupWizard = intent.getBooleanExtra(IN_XL_SETUP_WIZARD, false); if (mEnableNextOnConnection) { if (mEnableNextOnConnection && hasNextButton()) { diff --git a/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java b/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java index 2ebe87c..5e0b104 100644 --- a/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java +++ b/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java @@ -121,8 +121,6 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis (WifiSettings)getFragmentManager().findFragmentById(R.id.wifi_setup_fragment); mInputMethodManager = (InputMethodManager)getSystemService(Context.INPUT_METHOD_SERVICE); setup(); - // XXX: should we use method? - getIntent().putExtra(WifiSettings.IN_XL_SETUP_WIZARD, true); } public void setup() { @@ -243,6 +241,7 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis mProgressBar.setIndeterminate(false); mProgressBar.setProgress(2); mProgressText.setText(Summary.get(this, state)); + mStatusText.setVisibility(View.VISIBLE); mStatusText.setText(R.string.wifi_setup_status_proceed_to_next); mAddNetworkButton.setVisibility(View.GONE); @@ -275,6 +274,7 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis private void showConnectingStatus() { mProgressBar.setIndeterminate(false); mProgressBar.setProgress(1); + mStatusText.setVisibility(View.VISIBLE); mStatusText.setText(R.string.wifi_setup_status_connecting); mProgressText.setText(Summary.get(this, DetailedState.CONNECTING)); } @@ -284,6 +284,7 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis ((Button)findViewById(R.id.wifi_setup_add_network)).setEnabled(false); ((Button)findViewById(R.id.wifi_setup_refresh_list)).setEnabled(false); mProgressText.setText(Summary.get(this, DetailedState.SCANNING)); + mStatusText.setVisibility(View.VISIBLE); mStatusText.setText(R.string.wifi_setup_status_scanning); } @@ -327,14 +328,15 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis } else if (selectedAccessPoint != null && selectedAccessPoint.security == AccessPoint.SECURITY_EAP) { mStatusText.setText(R.string.wifi_setup_status_eap_not_supported); + mConnectButton.setVisibility(View.GONE); } else { - mStatusText.setText(R.string.wifi_setup_status_edit_network); + // mStatusText.setText(R.string.wifi_setup_status_edit_network); + mStatusText.setVisibility(View.GONE); + mConnectButton.setVisibility(View.VISIBLE); } mAddNetworkButton.setVisibility(View.GONE); mRefreshButton.setVisibility(View.GONE); mSkipOrNextButton.setVisibility(View.GONE); - mConnectButton.setVisibility(View.VISIBLE); - mConnectButton.setVisibility(View.VISIBLE); mBackButton.setVisibility(View.VISIBLE); // TODO: remove this after UI fix. // mDetailButton.setVisibility(View.VISIBLE); @@ -400,6 +402,7 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis } else { // During user's Wifi configuration. mWifiSettings.resumeWifiScan(); + mStatusText.setVisibility(View.VISIBLE); mStatusText.setText(R.string.wifi_setup_status_select_network); restoreFirstButtonVisibilityState(); |