From d85315222ec0510637bec3bab360d08c58041db6 Mon Sep 17 00:00:00 2001
From: Jesse Vincent <jesse@bestpractical.com>
Date: Sun, 30 Jun 2013 16:29:37 -0400
Subject: [PATCH] make the folders button in the account list more like a
 button. backcompat for pre-sdk-11 styles

---
 res/layout/accounts_item.xml | 37 +++++++++++++++++++++++++++---------
 res/values-v11/themes.xml    |  4 ++++
 res/values/attrs.xml         |  3 ++-
 res/values/themes.xml        |  4 ++++
 4 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/res/layout/accounts_item.xml b/res/layout/accounts_item.xml
index af4848f2b..e7d092d84 100644
--- a/res/layout/accounts_item.xml
+++ b/res/layout/accounts_item.xml
@@ -16,15 +16,6 @@
         android:layout_marginLeft="8dip"
         android:layout_marginRight="6dip" />
 
-    <ImageButton
-        android:id="@+id/folders"
-        android:gravity="center_vertical"
-        android:focusable="false"
-        android:layout_marginRight="3dip"
-        android:background="?attr/iconFolder"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -54,5 +45,33 @@
     </LinearLayout>
 
     <include layout="@layout/accounts_folders_icons" />
+    <LinearLayout
+        android:id="@+id/folder_button_wrapper"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        >
+    
+        <View
+            android:layout_width="1dp"
+            android:layout_height="match_parent"
+            android:layout_marginLeft="4dip"
+            android:layout_marginRight="4dip"
+            android:background="?attr/compatDividerVertical"
+            android:layout_alignParentTop="true"/>
+    <ImageButton
+        android:id="@+id/folders"
+        android:gravity="center_vertical"
+        android:focusable="false"
+        android:layout_marginRight="3dip"
+        android:src="?attr/iconFolder"
+        android:background="?attr/compatSelectableItemBackground"
+        android:layout_width="wrap_content"
+        android:layout_height="fill_parent"
+        android:padding="8dp"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp"
+        />
 
 </LinearLayout>
+</LinearLayout>
diff --git a/res/values-v11/themes.xml b/res/values-v11/themes.xml
index 0f2376517..25a5bb807 100644
--- a/res/values-v11/themes.xml
+++ b/res/values-v11/themes.xml
@@ -5,6 +5,8 @@
 
     <style name="Theme.K9.Dark" parent="Theme.K9.Dark.Base">
         <item name="composerBackgroundColor">@android:color/background_dark</item>
+        <item name="compatDividerVertical">@android:attr/dividerVertical</item>
+        <item name="compatSelectableItemBackground">?android:attr/selectableItemBackground</item>
     </style>
 
     <style name="Theme.K9.Light" parent="Theme.K9.Light.Base">
@@ -13,6 +15,8 @@
 
     <style name="Theme.K9.Dialog.Dark" parent="Theme.K9.Dark">
         <item name="backgroundColorChooseAccountHeader">#404040</item>
+        <item name="compatDividerVertical">@android:attr/dividerVertical</item>
+        <item name="compatSelectableItemBackground">?android:attr/selectableItemBackground</item>
     </style>
 
 </resources>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index f3b701b06..14b9d7b5c 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -49,7 +49,8 @@
         <attr name="messageViewAttachmentBackground" format="reference"/>
         <attr name="messageComposeAddContactImage" format="reference"/>
         <attr name="composerBackgroundColor" format="color"/>
-
+        <attr name="compatDividerVertical" format="reference"/>
+        <attr name="compatSelectableItemBackground" format="reference"/>
     </declare-styleable>
 
 </resources>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index f9db984b2..056adbecc 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -49,6 +49,8 @@
         <item name="messageViewHeaderBackgroundColor">#ffffffff</item>
         <item name="messageViewAttachmentBackground">@drawable/attachment_text_box_light</item>
         <item name="messageComposeAddContactImage">@drawable/ic_button_add_contact_light</item>
+        <item name="compatDividerVertical">?attr/messageListDividerColor</item>
+        <item name="compatSelectableItemBackground">@android:color/transparent</item>
     </style>
 
     <style name="Theme.K9.Dark.Base" parent="Theme.Sherlock">
@@ -97,6 +99,8 @@
         <item name="messageViewHeaderBackgroundColor">#000000</item>
         <item name="messageViewAttachmentBackground">@drawable/attachment_text_box_dark</item>
         <item name="messageComposeAddContactImage">@drawable/ic_button_add_contact_dark</item>
+        <item name="compatDividerVertical">?attr/messageListDividerColor</item>
+        <item name="compatSelectableItemBackground">@android:color/transparent</item>
     </style>
 
     <style name="Theme.K9.Light" parent="Theme.K9.Light.Base">