From 6bcca8b7ae3fab4609f67f32a52a10d4143093a9 Mon Sep 17 00:00:00 2001
From: Alexandra Gherghina <alexgherghina@google.com>
Date: Thu, 31 Jul 2014 11:09:26 +0100
Subject: [PATCH] Modify user spinner appearance to match mocks

Bug: 16518801
Change-Id: I30aa65251d4a4aaa80dbde5881fc56fffb7d54f7
---
 res/layout/spinner_view.xml    |  9 +++++++--
 res/layout/user_preference.xml | 17 +++++++++--------
 res/values/dimens.xml          |  9 +++++++--
 3 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/res/layout/spinner_view.xml b/res/layout/spinner_view.xml
index 72c96738230..88af2e2bc8a 100644
--- a/res/layout/spinner_view.xml
+++ b/res/layout/spinner_view.xml
@@ -16,5 +16,10 @@
 
 <Spinner xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/profile_spinner"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content" />
+        android:layout_width="wrap_content"
+        android:layout_height="@dimen/user_spinner_height"
+        android:dropDownVerticalOffset="@dimen/user_spinner_offset"
+        android:dropDownHorizontalOffset="@dimen/user_spinner_offset"
+        android:paddingBottom="@dimen/user_spinner_padding"
+        android:paddingTop="@dimen/user_spinner_padding"
+        android:paddingLeft="@dimen/user_spinner_padding" />
diff --git a/res/layout/user_preference.xml b/res/layout/user_preference.xml
index c0a68e5f2da..79ffc387d25 100644
--- a/res/layout/user_preference.xml
+++ b/res/layout/user_preference.xml
@@ -17,17 +17,17 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@android:id/widget_frame"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
+        android:layout_height="@dimen/user_spinner_item_height"
+        android:orientation="horizontal" >
 
     <ImageView
             android:id="@+android:id/icon"
-            android:layout_width="@dimen/user_icon_diameter"
-            android:layout_height="@dimen/user_icon_diameter"
+            android:layout_width="@dimen/user_icon_view_height"
+            android:layout_height="@dimen/user_icon_view_height"
             android:layout_gravity="center"
-            android:scaleType="fitCenter" />
+            android:scaleType="fitCenter"
+            android:paddingBottom="@dimen/user_spinner_padding"
+            android:paddingTop="@dimen/user_spinner_padding" />
 
     <TextView
             android:id="@+android:id/title"
@@ -38,6 +38,7 @@
             android:labelFor="@+android:id/icon"
             android:ellipsize="marquee"
             android:fadingEdge="horizontal"
-            style="@style/TextAppearance.Medium"/>
+            android:paddingStart="@dimen/user_spinner_padding"
+            style="@style/TextAppearance.Medium" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 24144b856a5..564128de15e 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -201,8 +201,13 @@
     <!-- Sim Card Name length -->
     <integer name="sim_name_length">32</integer>
 
-    <!-- Diameter of a round user icon -->
-    <dimen name="user_icon_diameter">56dp</dimen>
+    <!-- Height of a user icon view -->
+    <dimen name="user_icon_view_height">56dp</dimen>
+    <!-- User spinner offset-->
+    <dimen name="user_spinner_offset">-64dp</dimen>
+    <dimen name="user_spinner_height">72dp</dimen>
+    <dimen name="user_spinner_padding">8dp</dimen>
+    <dimen name="user_spinner_item_height">56dp</dimen>
 
     <!-- CheckBoxPreference -->
     <dimen name="checkbox_widget_min_width">58dip</dimen>