commit dc4926db23fb039a024211dafd86939e9f441901
author Amith Yamasani <yamasani@google.com> Tue Jan 11 13:19:24 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 11 13:19:24 2011 -0800
tree 11f0e0083a0b570ab77aad8eb702be8245214261
parent 844f323ee5fc7200b201eb23d3a37e9aa9a10cec
parent ffe813c380d7609fb94c65337b0964952f19c130

Merge "Remove phone number status conditionally for devices without voice." into honeycomb

res/layout-xlarge/date_time_settings_setupwizard.xml

diff --git a/res/layout-xlarge/date_time_settings_setupwizard.xml b/res/layout-xlarge/date_time_settings_setupwizard.xml
index 0b5d6bf..73aba01 100644
--- a/res/layout-xlarge/date_time_settings_setupwizard.xml
+++ b/res/layout-xlarge/date_time_settings_setupwizard.xml
@@ -18,7 +18,7 @@
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingTop="96dip"
+    android:paddingTop="160dip"
     android:paddingLeft="128dip"
     android:paddingRight="128dip"
     android:paddingBottom="96dip">
@@ -41,7 +41,7 @@
     <View
         android:id="@+id/top_divider"
         android:layout_width="match_parent"
-        android:layout_height="1px"
+        android:layout_height="3dip"
         android:layout_below="@id/title"
         android:background="@color/divider_color" />
 

res/layout-xlarge/wifi_settings_for_setup_wizard_xl.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 3e59faa..d3af1f8 100644
--- a/res/layout-xlarge/wifi_settings_for_setup_wizard_xl.xml
+++ b/res/layout-xlarge/wifi_settings_for_setup_wizard_xl.xml
@@ -20,8 +20,8 @@
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:paddingTop="120dip"
-    android:paddingLeft="96dip"
-    android:paddingRight="96dip"
+    android:paddingLeft="128dip"
+    android:paddingRight="128dip"
     android:paddingBottom="0dip" >
 
     <RelativeLayout
@@ -64,13 +64,6 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             style="?android:attr/progressBarStyleHorizontal" />
-
-        <View
-            android:id="@+id/divider"
-            android:layout_width="match_parent"
-            android:layout_height="1px"
-            android:layout_alignBottom="@id/scanning_progress_bar"
-            android:background="@color/divider_color" />
     </RelativeLayout>
 
     <TextView
@@ -80,7 +73,7 @@
         android:layout_below="@+id/top_divider"
         android:layout_alignParentLeft="true"
         android:layout_marginLeft="16dip"
-        android:layout_marginTop="32dip"
+        android:layout_marginTop="16dip"
         android:layout_marginBottom="0dip"
         android:text="@string/wifi_setup_status_select_network"
         android:textAppearance="?android:attr/textAppearanceMedium" />
@@ -112,7 +105,7 @@
             android:id="@+id/wifi_config_ui"
             android:layout_width="416dip"
             android:layout_height="wrap_content"
-            android:paddingTop="32dip"
+            android:paddingTop="16dip"
             android:visibility="gone" />
     </FrameLayout>
 

res/values-xlarge/colors.xml

diff --git a/res/values-xlarge/colors.xml b/res/values-xlarge/colors.xml
index 414f7c2..4447333 100644
--- a/res/values-xlarge/colors.xml
+++ b/res/values-xlarge/colors.xml
@@ -18,5 +18,5 @@
 -->
 
 <resources>
-    <color name="divider_color">#ff666666</color>
+    <color name="divider_color">#20ffffff</color>
 </resources>