Merge "Disable "add network" button." into honeycomb
diff --git a/res/layout-xlarge/wifi_settings_for_setup_wizard_xl.xml b/res/layout-xlarge/wifi_settings_for_setup_wizard_xl.xml
index b4fdf11..9b4a93d 100644
--- a/res/layout-xlarge/wifi_settings_for_setup_wizard_xl.xml
+++ b/res/layout-xlarge/wifi_settings_for_setup_wizard_xl.xml
@@ -137,7 +137,8 @@
style="@style/setup_wizard_button"
android:layout_alignParentLeft="true"
android:text="@string/wifi_setup_add_network"
- android:enabled="false" />
+ android:enabled="false"
+ android:visibility="gone" />
<LinearLayout
android:layout_width="wrap_content"
diff --git a/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java b/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
index be18177..7d8895d 100644
--- a/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
+++ b/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
@@ -186,7 +186,9 @@
private void restoreFirstButtonVisibilityState() {
showDefaultTitle();
- mAddNetworkButton.setVisibility(View.VISIBLE);
+ // TODO: uncomment this when the layout for it is ready. Note that we also have to remove
+ // android:visibility="gone" in xml then.
+ // mAddNetworkButton.setVisibility(View.VISIBLE);
mRefreshButton.setVisibility(View.VISIBLE);
mSkipOrNextButton.setVisibility(View.VISIBLE);
mConnectButton.setVisibility(View.GONE);