From ee5576ce0677ccae468fdefa70c541837178c4fc Mon Sep 17 00:00:00 2001
From: Daisuke Miyakawa <dmiyakawa@google.com>
Date: Tue, 18 Jan 2011 16:11:32 -0800
Subject: [PATCH] Polish layout and UI for wifi setup

Bug: 3347865
Change-Id: I529fc2f5e11388b34b66617aee64b7facd3708e0
---
 res/layout-xlarge/wifi_settings_for_setup_wizard_xl.xml      | 2 +-
 res/values/strings.xml                                       | 4 ++++
 .../android/settings/wifi/WifiSettingsForSetupWizardXL.java  | 5 +++++
 3 files changed, 10 insertions(+), 1 deletion(-)

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 29427d4f7ef..5de91f1c9ff 100644
--- a/res/layout-xlarge/wifi_settings_for_setup_wizard_xl.xml
+++ b/res/layout-xlarge/wifi_settings_for_setup_wizard_xl.xml
@@ -87,7 +87,7 @@
             android:layout_width="wrap_content"
             android:minWidth="406dip"
             android:layout_height="wrap_content"
-            android:minHeight="176dip"
+            android:minHeight="160dip"
             android:layout_alignParentLeft="true"
             android:visibility="gone" />
         <View
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0c51a2294ec..42b12eca7a4 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -3034,6 +3034,10 @@ found in the list of installed applications.</string>
          saying EAP can't be configured in SetupWizard flow.
          [CHAR LIMIT=NONE] -->
     <string name="wifi_setup_eap_not_supported">You can\u0027t configure an EAP Wi-Fi connection during setup. After setup, you can do that in Settings, under Wireless &amp; Networks.</string>
+    <!-- Message shown when the device is connecting a network [CHAR LIMIT=NONE] -->
+    <string name="wifi_setup_description_connecting">Connecting can take a few minutes...</string>
+    <!-- Message shown when the device is connected to a network [CHAR LIMIT=NONE] -->
+    <string name="wifi_setup_description_connected">Touch <b>Next</b> to continue with setup.\n\nTouch <b>Back</b> to connect to a different Wi-Fi network.</string>
 
     <!-- Do not translate. This is a stub which will be removed soon. -->
     <string name="time_zone_auto_stub" translatable="false">Select Time Zone</string>
diff --git a/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java b/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
index cb33d3b9e80..55a9fed6aa7 100644
--- a/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
+++ b/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
@@ -258,6 +258,7 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis
             mAddNetworkButton.setVisibility(View.GONE);
             mRefreshButton.setVisibility(View.GONE);
             mBackButton.setVisibility(View.VISIBLE);
+            mBackButton.setText(R.string.wifi_setup_back);
             mSkipOrNextButton.setVisibility(View.VISIBLE);
             mSkipOrNextButton.setEnabled(true);
             mHandler.removeCallbacks(mSkipButtonEnabler);
@@ -278,6 +279,7 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis
     }
 
     private void showConnectingStatus() {
+        mBackButton.setVisibility(View.VISIBLE);
         // We save this title and show it when authentication failed.
         mEditingTitle = mTitleView.getText();
         showConnectingTitle();
@@ -369,6 +371,7 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis
             mAddNetworkButton.setVisibility(View.GONE);
             mRefreshButton.setVisibility(View.GONE);
             mBackButton.setVisibility(View.VISIBLE);
+            mBackButton.setText(R.string.wifi_setup_back);
         } else {
             mConnectButton.setVisibility(View.VISIBLE);
 
@@ -382,6 +385,7 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis
             mAddNetworkButton.setVisibility(View.GONE);
             mRefreshButton.setVisibility(View.GONE);
             mBackButton.setVisibility(View.VISIBLE);
+            mBackButton.setText(R.string.wifi_setup_cancel);
         }
     }
 
@@ -399,6 +403,7 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis
 
         // Might be better to delay showing this button.
         mBackButton.setVisibility(View.VISIBLE);
+        mBackButton.setText(R.string.wifi_setup_back);
 
         // We need to restore visibility status when the device failed to connect the network.
         final View wpsFieldView = findViewById(R.id.wps_fields);