Merge "Update Pre-L account switcher" into ub-gmail-ur14-dev

11 files changed, 5 insertions, 5 deletions

diff --git a/res/drawable-hdpi/ic_drawer_accnt_check_24dp.png b/res/drawable-hdpi/ic_drawer_accnt_check_24dp.png
new file mode 100644
index 000000000..cdc86b6e1
--- /dev/null
+++ b/res/drawable-hdpi/ic_drawer_accnt_check_24dp.png
diff --git a/res/drawable-hdpi/ic_menu_check_holo_light.png b/res/drawable-hdpi/ic_menu_check_holo_light.png
deleted file mode 100644
index df428e2ac..000000000
--- a/res/drawable-hdpi/ic_menu_check_holo_light.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_drawer_accnt_check_24dp.png b/res/drawable-mdpi/ic_drawer_accnt_check_24dp.png
new file mode 100644
index 000000000..e90ecaab1
--- /dev/null
+++ b/res/drawable-mdpi/ic_drawer_accnt_check_24dp.png
diff --git a/res/drawable-mdpi/ic_menu_check_holo_light.png b/res/drawable-mdpi/ic_menu_check_holo_light.png
deleted file mode 100644
index c43372ac5..000000000
--- a/res/drawable-mdpi/ic_menu_check_holo_light.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_drawer_accnt_check_24dp.png b/res/drawable-xhdpi/ic_drawer_accnt_check_24dp.png
new file mode 100644
index 000000000..43e2cba2b
--- /dev/null
+++ b/res/drawable-xhdpi/ic_drawer_accnt_check_24dp.png
diff --git a/res/drawable-xhdpi/ic_menu_check_holo_light.png b/res/drawable-xhdpi/ic_menu_check_holo_light.png
deleted file mode 100644
index c0df2273c..000000000
--- a/res/drawable-xhdpi/ic_menu_check_holo_light.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/ic_drawer_accnt_check_24dp.png b/res/drawable-xxhdpi/ic_drawer_accnt_check_24dp.png
new file mode 100644
index 000000000..a821abd9f
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_drawer_accnt_check_24dp.png
diff --git a/res/drawable-xxhdpi/ic_menu_check_holo_light.png b/res/drawable-xxhdpi/ic_menu_check_holo_light.png
deleted file mode 100644
index ca93e7046..000000000
--- a/res/drawable-xxhdpi/ic_menu_check_holo_light.png
+++ /dev/null
diff --git a/res/drawable-xxxhdpi/ic_drawer_accnt_check_24dp.png b/res/drawable-xxxhdpi/ic_drawer_accnt_check_24dp.png
new file mode 100644
index 000000000..96191150a
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_drawer_accnt_check_24dp.png
diff --git a/res/layout/account_item.xml b/res/layout/account_item.xml
index 51c6fa66a..4bddb2db4 100644
--- a/res/layout/account_item.xml
+++ b/res/layout/account_item.xml
@@ -20,7 +20,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_height="wrap_content"
     android:layout_width="match_parent"
-    android:padding="8dp"
+    android:padding="16dp"
     android:minHeight="@dimen/account_item_minimum_height"
     android:background="@drawable/nonfolder_item">
 
@@ -61,9 +61,9 @@
 
     <ImageView
         android:id="@+id/checkmark"
-        android:layout_width="48dp"
-        android:layout_height="48dp"
-        android:src="@drawable/ic_menu_check_holo_light"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:src="@drawable/ic_drawer_accnt_check_24dp"
         android:layout_gravity="center_vertical" />
 
 </com.android.mail.ui.AccountItemView>
diff --git a/res/values/dimen.xml b/res/values/dimen.xml
index 86c808ebb..e8496497d 100644
--- a/res/values/dimen.xml
+++ b/res/values/dimen.xml
@@ -17,7 +17,7 @@
 -->
 
 <resources>
-    <dimen name="account_avatar_dimension">48dp</dimen>
+    <dimen name="account_avatar_dimension">40dp</dimen>
     <dimen name="drawer_width">300dp</dimen>
     <dimen name="two_pane_drawer_width_mini">72dp</dimen>
     <dimen name="two_pane_drawer_width_open">288dp</dimen>