From c05efc1df7576b05d878734c7a5b220b5c9e3bb9 Mon Sep 17 00:00:00 2001
From: Daisuke Miyakawa <dmiyakawa@google.com>
Date: Tue, 19 Oct 2010 10:10:25 -0700
Subject: [PATCH] UI refresh

Bug: 3110575
Change-Id: Ia6ffef6de8882920b89372052b5e29968bedfe5f
---
 .../wifi_settings_for_setup_wizard_xl.xml     | 57 ++++++++++++-------
 res/values-xlarge/colors.xml                  | 22 +++++++
 .../android/settings/wifi/WifiSettings.java   |  2 +-
 3 files changed, 61 insertions(+), 20 deletions(-)
 create mode 100644 res/values-xlarge/colors.xml

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 98b88ea1b3a..a22cd466991 100644
--- a/res/layout-xlarge/wifi_settings_for_setup_wizard_xl.xml
+++ b/res/layout-xlarge/wifi_settings_for_setup_wizard_xl.xml
@@ -18,8 +18,8 @@
               android:layout_width="fill_parent"
               android:layout_height="fill_parent"
               android:keepScreenOn="true"
-              android:paddingTop="70dip"
-              android:paddingBottom="80dip"
+              android:paddingTop="140dip"
+              android:paddingBottom="60dip"
               android:paddingLeft="60dip"
               android:paddingRight="60dip">
 
@@ -53,22 +53,33 @@
                   android:layout_width="0px"
                   android:layout_weight=".4"
                   android:layout_height="fill_parent"
-                  android:paddingTop="20dip"
+                  android:paddingTop="80dip"
                   android:paddingLeft="50dip"
                   android:paddingRight="50dip"
                   android:paddingBottom="15dip">
+        <!-- divider -->
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dip"
+            android:layout_marginBottom="4dip"
+            android:background="@color/divider_color" />
         <!-- Assume the text size of this text should be same as Preference's
              texts. See also preference.xml -->
         <TextView android:id="@+id/wifi_setup_status"
                   android:layout_width="fill_parent"
                   android:layout_height="wrap_content"
-                  android:background="#ff555555"
+                  android:background="#00000000"
+                  android:textColor="#ff666666"
                   android:paddingLeft="5dip"
-                  android:paddingTop="5dip"
-                  android:paddingBottom="5dip"
-                  android:layout_marginBottom="20dip"
                   android:textAppearance="?android:attr/textAppearanceLarge"
                   android:text="@string/wifi_setup_status_select_network"/>
+        <!-- divider -->
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dip"
+            android:layout_marginTop="4dip"
+            android:layout_marginBottom="20dip"
+            android:background="@color/divider_color" />
         <fragment class="com.android.settings.wifi.WifiSettings"
                   android:id="@+id/wifi_setup_fragment"
                   android:layout_width="fill_parent"
@@ -80,14 +91,17 @@
                     android:layout_width="0px"
                     android:layout_weight=".3"
                     android:layout_height="fill_parent"
+                    android:gravity="right"
                     android:paddingTop="22dip"
-                    android:paddingLeft="50dip"
+                    android:paddingRight="50dip"
                     android:paddingBottom="10dip">
         <TextView android:id="@+id/scanning_progress_text"
                   android:layout_width="fill_parent"
                   android:layout_height="wrap_content"
                   android:layout_alignParentTop="true"
-                  android:textSize="24dip"/>
+                  android:gravity="right"
+                  android:textSize="22dip"
+                  android:textColor="#ff40520f" />
         <ProgressBar android:id="@+id/scanning_progress_bar"
                      android:layout_width="220dip"
                      android:layout_height="wrap_content"
@@ -95,40 +109,45 @@
                      style="?android:attr/progressBarStyleHorizontal" />
 
         <Button android:id="@+id/wifi_setup_connect"
-                android:layout_width="220dip"
-                android:layout_height="wrap_content"
+                android:layout_width="260dip"
+                android:layout_height="60dip"
+                android:layout_alignParentRight="true"
                 android:layout_alignParentBottom="true"
                 android:textSize="24dip"
                 android:text="@string/wifi_connect"
                 android:visibility="gone" />
         <Button android:id="@+id/wifi_setup_forget"
-                android:layout_width="220dip"
-                android:layout_height="wrap_content"
+                android:layout_width="260dip"
+                android:layout_height="60dip"
+                android:layout_alignParentRight="true"
                 android:layout_alignParentBottom="true"
                 android:textSize="24dip"
                 android:text="@string/wifi_forget"
                 android:visibility="gone" />
 
         <Button android:id="@+id/wifi_setup_add_network"
-                android:layout_width="220dip"
-                android:layout_height="wrap_content"
+                android:layout_width="260dip"
+                android:layout_height="60dip"
                 android:layout_above="@+id/wifi_setup_refresh_list"
+                android:layout_alignParentRight="true"
                 android:textSize="24dip"
                 android:text="@string/wifi_setup_add_network"
                 android:enabled="false" />
 
         <Button android:id="@+id/wifi_setup_refresh_list"
-                android:layout_width="220dip"
-                android:layout_height="wrap_content"
+                android:layout_width="260dip"
+                android:layout_height="60dip"
                 android:layout_above="@+id/wifi_setup_skip_or_next"
+                android:layout_alignParentRight="true"
                 android:textSize="24dip"
                 android:text="@string/wifi_setup_refresh_list"
                 android:enabled="false" />
 
         <Button android:id="@+id/wifi_setup_skip_or_next"
-                android:layout_width="220dip"
-                android:layout_height="wrap_content"
+                android:layout_width="260dip"
+                android:layout_height="60dip"
                 android:layout_marginTop="30dip"
+                android:layout_alignParentRight="true"
                 android:layout_alignParentBottom="true"
                 android:textSize="24dip"
                 android:text="@string/wifi_setup_skip"
diff --git a/res/values-xlarge/colors.xml b/res/values-xlarge/colors.xml
new file mode 100644
index 00000000000..06078faadd4
--- /dev/null
+++ b/res/values-xlarge/colors.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+ * Copyright (C) 2010 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+
+<resources>
+    <color name="divider_color">#ff222222</color>
+</resources>
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index 318542b1b6e..85e399d2cb0 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -93,7 +93,7 @@ public class WifiSettings extends SettingsPreferenceFragment
     // ListView won't become larger than the screen.
     //
     // This constant doesn't affect other contexts other than SetupWizard XL.
-    private static int MAX_MENU_COUNT_IN_XL = 7;
+    private static int MAX_MENU_COUNT_IN_XL = 6;
 
     private final IntentFilter mFilter;
     private final BroadcastReceiver mReceiver;