From 0061b3da8110619a3e078179322d8577706fc337 Mon Sep 17 00:00:00 2001
From: Jesse Vincent <jesse@fsck.com>
Date: Thu, 14 Jan 2010 00:33:05 +0000
Subject: [PATCH] steal a more compact android-standard checkbox style from
 AOSP. Tighten up the touchview

---
 res/drawable/btn_check_buttonless_off.png  | Bin 0 -> 608 bytes
 res/drawable/btn_check_buttonless_on.png   | Bin 0 -> 721 bytes
 res/drawable/checkbox.xml                  |  14 +++-----------
 res/layout/message_list_item_touchable.xml |   9 ++++++---
 res/layout/message_list_widgets.xml        |   1 -
 5 files changed, 9 insertions(+), 15 deletions(-)
 create mode 100755 res/drawable/btn_check_buttonless_off.png
 create mode 100755 res/drawable/btn_check_buttonless_on.png

diff --git a/res/drawable/btn_check_buttonless_off.png b/res/drawable/btn_check_buttonless_off.png
new file mode 100755
index 0000000000000000000000000000000000000000..f8972fc458f22599dc97503835503ea4b378bd81
GIT binary patch
literal 608
zcmV-m0-ybfP)<h;3K|Lk000e1NJLTq000{R001xu1^@s6;J*Q&00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj5AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF*
zm;eA5aGbhPJOBUy7<5HgbW?9;ba!ELWdKlNX>N2bPDNB8b~7$BH8Ae8p8x;>x=BPq
zR9Hvtl}}E>Kp4eIh#R9(3$zG=60|88gcM`{m@X{~*KiKP30QIrj=&8#0!QHp@Ln=a
zYE#;R)P<QzUP#(ue)GL~^R-ZrLpmTGkPb)({+$CCsK|xBpl+Vk5#&MdPzSP>%VjGs
zU>^(jpb~TowbtwPaJSoCo*QUl!6BpxP<1>W4*(+U`kb&Z=mrZ{T-WVxw_AeRd4fus
zraf;q8-hAeF$u;)=5FYD+K5(khd(q|s}(`CF!8KtfiGhFZ5W20K#PL7x%zxQCx}Yj
z><9kv0x3`f`W%f$uQ9+lP<1ky^aZGvW(nW362_JlQgOg2=;T1C06akSJ`8jn#~I*R
z9O$S({HWNrZB|zm0SSP0Q8g{*Jqn&56^K}CbzL{`q7qs(SUmj80Mur)nVB^Zht9F6
zC<-eq9{>`hAv|va#IrqpSeA9Asw(drlNqh7jB8<t4v};{vTwliynD=UMgpUtL$pPQ
z=%sat>@>{ueV^4aAheEwXyCJvsY4tE3MQMT$#2sm^faALgAT#_n9o=&79CL$VZRGR
umMsEOqO#1DbEE^(0qKBrKsxY;4(tIUE2b2M)0A8Q0000<MNUMnLSTX^S@2f?

literal 0
HcmV?d00001

diff --git a/res/drawable/btn_check_buttonless_on.png b/res/drawable/btn_check_buttonless_on.png
new file mode 100755
index 0000000000000000000000000000000000000000..a10a37ae54480e0c364f6fc6290b1996aa967f7d
GIT binary patch
literal 721
zcmV;?0xtcDP)<h;3K|Lk000e1NJLTq000{R001xu1^@s6;J*Q&00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj5AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF*
zm;eA5aGbhPJOBUy7<5HgbW?9;ba!ELWdKlNX>N2bPDNB8b~7$BH8Ae8p8x;?D@jB_
zR9Hvtl|M*ZQ5eO~;F|(9@*uV;BAG-S8l*0DkkF+|sY^gg2ZgE#C8&d-P%s6d)M8Ds
z)>dgDf`e#990aBR{6kdy)1cILY3EKI>VA8^cmt2f%QI>^lp8oa!n-%W?>qN=H-PyV
z2aE&80pq}b=0FgBMDZ4P@sZE|;&peGpcwX$fI^ZQhH8D>dZ#$R`|RiyAuH4xH4W99
z?Cn!ZUAkCc3qj8bSfWzY0#xOT$`nDjDf{AJPS7Sni%?}_Wk1q~=_Z2eiUZmvXc@|y
zu#OV5i5Ni*l;sY)!b6Ur8P^c@tjO8X9zma|S*W&&wgEzJ<v*)h0y^*$54ouaD$o?@
za0NO+Uvwbmq3TEKr}Q~p&R=Ytph<3Ar`}P6P}S|#-6uBXf=&ja%F`9b_BTEdvP<o_
z0CPcS4#Wd=f>vOa5^J)+r%<7mP(SWD;w|qB4n$7B_7i(10~Bl08Yti2P-3ynk$^;>
z3kigavA$8?HyKK7Q2W}}Ee)0eL~^byB0LhFKV2Z)PB8?3$#}^h8BWNV98iar!uQf+
zxD>%+%3qf6Yfz1MAo8rR8|~}XxOIg0x}&cessrJB?fa!~h#ThuWj6=9IA?Q&$gs-L
zN?-_g+z>bO-w*|s5quOJ$^=GkaR~(B(Xr^T_YF}XD7)PM%)gxJka7f~;*3A%y)7~r
ziR+H!FXMcH@WugzRESQq)~qoO7zd04#sTBNKXl+P8x?U`dgzFa00000NkvXXu0mjf
DeOfbV

literal 0
HcmV?d00001

diff --git a/res/drawable/checkbox.xml b/res/drawable/checkbox.xml
index a35336c26..eecda8fa4 100644
--- a/res/drawable/checkbox.xml
+++ b/res/drawable/checkbox.xml
@@ -1,16 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-     <item android:state_checked="true" android:state_focused="true"
-          android:drawable="@drawable/checkbox_on_background_focus_yellow" />
-
-     <item android:state_checked="false" android:state_focused="true"
-          android:drawable="@drawable/checkbox_off_background_focus_yellow" />
-
      <item android:state_checked="false"
-          android:drawable="@drawable/checkbox_off_background" />
+         android:drawable="@drawable/btn_check_buttonless_off" />
 
      <item android:state_checked="true"
-          android:drawable="@drawable/checkbox_on_background" />
-
-</selector>
\ No newline at end of file
+         android:drawable="@drawable/btn_check_buttonless_on" />
+</selector>
diff --git a/res/layout/message_list_item_touchable.xml b/res/layout/message_list_item_touchable.xml
index 905063bf4..bd4d36f60 100644
--- a/res/layout/message_list_item_touchable.xml
+++ b/res/layout/message_list_item_touchable.xml
@@ -19,7 +19,10 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_toRightOf="@id/chip"
+                android:button="@drawable/checkbox"
+                android:layout_centerVertical="true"
                 android:focusable="false"
+                android:paddingLeft="3dip"
                 />
        <CheckBox
                  android:id="@+id/flagged"
@@ -39,7 +42,7 @@
         android:textColor="?android:attr/textColorPrimary"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:paddingLeft="10dip"
+        android:layout_marginLeft="1dip"
         android:layout_toLeftOf="@id/date"
         android:layout_toRightOf="@+id/selected_checkbox"
         android:layout_marginRight="1dip"
@@ -65,9 +68,9 @@
            android:singleLine="false"
            android:layout_width="fill_parent"
            android:layout_height="fill_parent"
-        android:paddingLeft="10dip"
+        android:layout_marginLeft="1dip"
         android:layout_toLeftOf="@id/flagged"
-        android:layout_marginRight="1dip"
+        android:layout_marginRight="0dip"
         android:bufferType="spannable"
            />
 
diff --git a/res/layout/message_list_widgets.xml b/res/layout/message_list_widgets.xml
index 4a1645fde..9172c3346 100644
--- a/res/layout/message_list_widgets.xml
+++ b/res/layout/message_list_widgets.xml
@@ -23,6 +23,5 @@
                 android:layout_centerVertical="true"
                 android:focusable="false"
                 android:button="@drawable/checkbox"
-                android:background="@drawable/checkbox_background"
                 />
     </LinearLayout>