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

Merge "Set attachToRoot instead of manually doing so."

Browse Source
This commit is contained in:
Daisuke Miyakawa
2010-11-12 14:06:21 -08:00
committed by Android (Google) Code Review
parent c05dedf9be 91e9683d8f
commit 505a0c2ad0
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/wifi/WifiConfigUiForSetupWizardXL.java
View File

@@ -67,7 +67,7 @@ public class WifiConfigUiForSetupWizardXL implements WifiConfigUiBase, OnFocusCh
mEdit = edit; mEdit = edit;
mInflater = (LayoutInflater)activity.getSystemService(Context.LAYOUT_INFLATER_SERVICE); mInflater = (LayoutInflater)activity.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
mView = mInflater.inflate(R.layout.wifi_config_ui_for_setup_wizard, parent, false); mView = mInflater.inflate(R.layout.wifi_config_ui_for_setup_wizard, parent, true);
mController = new WifiConfigController(this, mView, mAccessPoint, edit); mController = new WifiConfigController(this, mView, mAccessPoint, edit);
// Set Focus to password View. // Set Focus to password View.

2
src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
View File

@@ -334,7 +334,7 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis
} else { } else {
view.findViewById(R.id.wifi_general_info).setVisibility(View.GONE); view.findViewById(R.id.wifi_general_info).setVisibility(View.GONE);
} }
parent.addView(view); // parent.addView(view);
mStatusText.setText(R.string.wifi_setup_status_edit_network); mStatusText.setText(R.string.wifi_setup_status_edit_network);
mAddNetworkButton.setVisibility(View.GONE); mAddNetworkButton.setVisibility(View.GONE);