From 8ae706b0dda0566bb4ae4bd021ce7b80ead5545f Mon Sep 17 00:00:00 2001
From: Tim Su <tim@todoroo.com>
Date: Mon, 8 Aug 2011 21:48:59 -0700
Subject: [PATCH] More theme issues unearthed and fixed

---
 .../todoroo/astrid/tags/TagFilterExposer.java |   2 +-
 .../drawable-hdpi/filter_btn_background.9.png | Bin 0 -> 808 bytes
 .../res/drawable-hdpi/header_tasks_normal.png | Bin 2500 -> 2353 bytes
 astrid/res/drawable/edit_titlebar.9.png       | Bin 174 -> 177 bytes
 astrid/res/drawable/edit_titlebar_white.9.png | Bin 171 -> 171 bytes
 .../res/drawable/filter_btn_background.9.png  | Bin 809 -> 808 bytes
 astrid/res/drawable/filter_count.xml          |   2 +-
 astrid/res/layout/contact_adapter_row.xml     |   2 +-
 astrid/res/layout/task_edit_activity.xml      |   2 +-
 astrid/res/layout/task_list_body_tag.xml      |   4 ++++
 astrid/res/layout/update_adapter_row.xml      |   1 +
 astrid/res/values/attrs.xml                   |   1 +
 astrid/res/values/keys.xml                    |   1 +
 astrid/res/values/strings-core.xml            |   5 +++--
 astrid/res/values/styles.xml                  |   6 +++++-
 .../astrid/activity/FilterListActivity.java   |   2 +-
 .../todoroo/astrid/adapter/FilterAdapter.java |   2 ++
 .../todoroo/astrid/service/ThemeService.java  |   2 ++
 18 files changed, 24 insertions(+), 8 deletions(-)
 create mode 100644 astrid/res/drawable-hdpi/filter_btn_background.9.png

diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/TagFilterExposer.java b/astrid/plugin-src/com/todoroo/astrid/tags/TagFilterExposer.java
index bf9983fd6..3bbf03c2b 100644
--- a/astrid/plugin-src/com/todoroo/astrid/tags/TagFilterExposer.java
+++ b/astrid/plugin-src/com/todoroo/astrid/tags/TagFilterExposer.java
@@ -172,7 +172,7 @@ public class TagFilterExposer extends BroadcastReceiver {
                 new Comparator<Tag>() {
             @Override
             public int compare(Tag object1, Tag object2) {
-                return object1.tag.compareTo(object2.tag);
+                return object1.tag.compareToIgnoreCase(object2.tag);
             }
         });
         for(Iterator<Entry<String, Tag>> i = tags.entrySet().iterator(); i.hasNext(); ) {
diff --git a/astrid/res/drawable-hdpi/filter_btn_background.9.png b/astrid/res/drawable-hdpi/filter_btn_background.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..6f0ad1811d8176f6e1fdf4d2532f0e939102a2ce
GIT binary patch
literal 808
zcmV+@1K0eCP)<h;3K|Lk000e1NJLTq000^Q001fo1^@s6tuRYt00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iph<
z1R5Z9A27%O00O8<L_t(o!|j*PZlf>|hd;2538ftJM`|iX>Z9zNMR~-Yd+f1Qs}yJe
zV|x!3S(4Iix?y|jNS2T={`{L6JmY}V&Hv?H@Y%<M6QU?uJLdp!&f&fPbQfV5;+!Ln
zW16PHTD$4Lm&YH(alCGt2Jby#7^0LS2m*p&c+=i{y!SZgu+~!7HBw5fwI3_WvTXhG
z@&dqoJ||66;y6YKK^TS~s<GD6G!1#4^YHM1a}FWIfvTXdq^c?aR;v})*VjxYlTRU?
zD(4(^UGwzx#Qps}MNu%H&v|}+##+0P078iMWHO<uDsFCWSglqhNy1l52!T=xtu<O}
z?(Xh*e0=2c@{&By-(sY-rYuVqiv`Q&60P++AAbcno6P{Yy}dmIMNx!Ois^Jp9LIDS
zca9}VLKH;^AppDt2!a5mR2RSxGwf9BvQ%rmkFV@Y?lS0HQ1}0JYaW2S_gHIb+jbO1
z*4l#*$m9RPTKj1_pJLrwgNmGU`|;lt^+99U@mlX<WQ-XlMs3>;yRPro|C$W_6L<_z
z=en-M$f4u@T<a9|>)5*(jRiVhM-FAmDHZjrps?!&`mXDq&mDt`+P0;ts(&sIL&fk|
zQE;qitZ@wb7W)DHfPO$Dg3diizXTfN<o?@PN7FQ9S+=i9W5A3teP9p*)OEd|P*oMi
zn6qHsdyFwG77NO<{G+IC+f7jvTwPt!DQw&Jp8(D|%CbaCNgT(#zP`S-+`UP^gb+-p
zQ}R6DHz}tyD*bl4u4|GcVYytg-EJw%a`WzLsgzo$X-b-=<ath6mU~~HQoiFjW;UB4
zrDVI^vfJ&bs%kTMD_2Ubwbo==#>K@2LWq-8Ip;9Ou-ok@iUMQI9`fP!Un#YYq6jJF
m$qj!OpSEpr&K*F$)qVr2PCnq%tk$>y0000<MNUMnLSTZM`+2PZ

literal 0
HcmV?d00001

diff --git a/astrid/res/drawable-hdpi/header_tasks_normal.png b/astrid/res/drawable-hdpi/header_tasks_normal.png
index 8aab73116655f7b8d369ecf2e7b80fb366658c19..bac6f93df5e3ed21692fc5f6023c70c5c0475b12 100644
GIT binary patch
delta 2280
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
CW><~?

delta 2428
zcmV-?34`{r62udbVSfWJ1({_qyZ`_RL`g(JRCwC$nqN#4TOP;1XZmN#OiMwKYt@@v
zC?Kp4vLOiTlDj<k<cl%!L5YB%Z${#SMv=s(L6pRO(!>`NG1M5N31Cb#zU<PCL<5O{
ziMW?P0X7STA|UNRnNB;i58LV1+9K@?$aVWoPDo1U%sHR_{(qhsAf=R2N-3q3Qc5YM
z|3{InxJgAtg^lNV1cO0nG#W^fl=wmkiTk-ENzmzZs;!rzD7=09*8bfA78e)WR##U+
zQ4}bO+7gRM=EsRQPg+_UhKGmkTMn?iyxit?yFt@5GBPs2vMgwt1|bBZC~gWQQ502$
z$8j8%mX;6*1b?u1@7^w_)A@c&0G5`P+CG2&jI69I<mBXlVHoIix=pdbNMMpA#dY&!
z<`o119LK@sa)IMGjE;`Rv_y^C@H`$5EEWrP@7@iTWuet-w<eeqqUu~4jRrJLgJBr>
zd_H7nXIHu1Zs(?1U|Ct2&Fl4I=gytT$;kmt)2g`ZcYn>Wp&!NL@nC9d3K<z0E3aR_
z{%hoSR56c(2M>nbHaj~TTCEm=Kwvvn8U%n88VN&W7zXL-=~!7=VWa=A7+^(3g>7+h
z5oWU)Sy@@oYPG5cbS0{)sv@UPpQc%sEt;5^_~+fbclpW5$%GarNfIcEg3)LM$8k^<
zU}a_H#eccEIWP=^%*@QN<!uLezx?ux4DT-h{*arSyX*Mz<2`L{ZG0k@C|3?ztu|(y
zRRnNpX^Ax$49L#ThQVNfBuU!>9sqLw{COGP9|0Hu6qlEm&q|W?J`sSj1yU3RjYgv$
zz|zuE+seucGBY#d!b=b)$<58BSe8vRu}N;XTYq%B-SW-I$&)APyu7?fcmS~Y=FOXt
zU@#~q8Usa9j2o7c2I%#AVKSM(Fbn`77z`#g56iNoy1JS=eE2YJG#dW|ASZ##{Q!Qu
za^=eK?Ch)r0C{<NRCRUrp(uDffayn%9`T|ml0=gUAtdhpk^)#<Tx=tRz-Tmrq9{f1
zZhzjqNn5SfLjd*y*bRW*;N?7k!LF{Zv7w=%u=QQIaDfK!bHqG6fWe0kANG!ojU}~E
zx!;aemL&}Ez<~p{m6a7_Wo0R@^^P7rN`>GZ0I&#PDuK)AXJ==79S+A@Xbt4lsZ+Go
zYW)>}C8EZi86O{aIvft4l6p`T7p|zNuz$_Z&%<amf?*h?NrN0ac1*UGMULY-J3Bjl
zLqkIwj(u};b3w1y3jnZMtyE1-%^?6K(XM;z)~%#mH`;|2Tj0XN0(3eZOePa3ic;EX
zP@$M-0WkII)hk~|M@JyZ?ucBxcrm8yc64+k?Yfc4FrKk&7~uZ>`)xj-4;dL5(0}Q4
zYP4x2lrU%j;5ZIRS_!GEtE2Pt^CMlC2QWA|IN0;x!2_S-g@$5a(g4fK%4}}88)mZ^
zX=!O2cHKl8{A9y{)oP{c>gu9hcZTCQXIopFPib8$*MW)vE-WlSuh)l5mW^6pB8!j8
za%9)8U6j#i#Ms!FxQ<nl%a<?5a(~_F_V#w(<#Ht*_oB}llTIQ<MMXBB&j+*F9PV>B
zLlFQ;Q&SUt<j9dj0LbX*Xm4X<BhPVM^y*1{eLY=JQ1F%O4h#(RK6&yasOI|OB@yad
z-3G^TU|ALhgW;=ys&vGHSXo&~h2WI|C@Ux^sJeaoHqEjuiM-ZowNecY4S!#`uGi~z
zwzjtVLf<3x_4QOqNeNN9&UoImF2MQudC)WsmSw-Fg*F4A{8@f}J^}Dk2#NtfNi;;3
zWy#g6S7W;F{rmTMm&-*$b5RWq4TX{<QIaGj4KZ@x8wOZVP+$W9lgR{)MiY($8y)hE
z*Bh~1*y(gi0Nf!UkRcWp7JpXVxpRkR7zXwA^>krj;a9Hv?%liI$B!QeMNyPQQIsL?
z6h)CFy8h_B#Op+;c-_Y8>MD#zBlLRxH)|pl4idr|9UT>0T3UJm490@k(b188;>3xn
zSgzaB(ju2E<jk2fGUOaJ;&Z(H#7rWeK7E2tr-NRvha^c!_qvHLGJkX*>G|{LYmy}O
zT)TD+p+f;$hG?-^eg=>g-EG{vcaNW*o+bb!i^W2nJ$qJ;k5i&3D&9jZuZas#en{>2
z`?u_9UJwNMeE+L?pFVxM=J)%1u3x_%4RLowx55J$?C<aIZEtT66WXz3ha5*~0N{E4
zi@B2p==b|K25@q6(tn<xpKs%N9y*;))hAvXu)wf7J3H4zQS7;K<3=RJ$i>WfJRWCL
zQ<E?9+GtBrYJuzZ!f}(x*w~m|u73z2n=)c8G<rOH_H3=Wxw!|xKtxOoyYAh)cX^k~
zMb?{JjdjLb^SXs}dU`sRmzO~Z*|O)mvDDq&y#}DCwY60Uoqro<0r=S0*VpTCID+_&
zTDJ}y7#OgprKLd-ge^%V--6iO+}z{wc%B0ITVG$_-y0hnefZA$rdfUX@WEbKSZEUj
z0fdk(dr2q`M6tWOdlkTY0NdiJ{f20ajEvZo9Nnv#Yoh-CJ^;!|MHEE{f}kc0x#Q5A
zOeTE-VAlQKo_{@iwvP)(YJ7a$o|~I%Qz@y49*^fudV2a^0G8U?+Ft?u!|V0>l}=n!
zQ)2+2$A6#N&G+~BOWOh<05A-L)z#JT8%#<p(BW|K=gyt`cc`Z=sjaR3DYR*&(uXqj
zU{_aHFMv&pJxNu_`}Xa#34#E<Uau&rm`o<p-ri0Z7k?N3IaHolu<^&5@x%jg0hs>y
z@ndg&eZ5b9@T9a8@pwF#nVI?GJ;9_*$XZaqt@(U~@;lGTb}D|qA1`0N4DdYvucD%&
z-)NfF09XUCpkR!7Jf2rCUc4B)bm@{`4R~^=#PdA7UawQJ1<K0J&9!N@S~XtqmXF>w
zQ2x%M6n}DARgUw&Wr2!{x`~MidoUPOqr8zfDuy<%WQbc?>L^a727>`S&#P5rZ=3o~
z^*S(~hKGmk8jS{mAZ(Xc+crg_D8@7pRr<1#krBI`6n<0%0)g;@HN{ytmX?;5oMyAR
zN`9O3N0OX@CnhHBn__{oCMPHDfj~gbc5hpV=XLqGO@l`5n=LOdJ5452l_W_&ge3}s
zfIuLC$;nCkmH?C?rl+S@1%p9Q6czV0S5e^@HJ{oEOm^E~Fo>zCDZ8qzTp}&s?>VvP
ubh>bYOev+5Qc5YMlu}A5rIb?IKKc)<feHNSK00v#0000<MNUMnLSTY+(w$}i

diff --git a/astrid/res/drawable/edit_titlebar.9.png b/astrid/res/drawable/edit_titlebar.9.png
index 5363c7f1914491394211cddd1e2b2e330ecb69dc..cdc2cebab694c9b507e61150a19b98342286b2d5 100644
GIT binary patch
delta 91
zcmV-h0Hpt}0kHv)T~q`x8r*m#QUCw|HAzH4R0!8S$gvH8Fc1X6;gFjkcS8RSPy~@n
xpok}U$(xL{P@LSpCrpHes34B&Ihw0^?S3(92HeyX#v=d#002ovPDHLkV1gv#BdY)a

delta 88
zcmV-e0H^=40j>d%T~PuZHp&NY>;M1&GD$>1R0!84%b^VbArM8u;U~yz0E5ENe>W7f
uCss}Jk_Sb&2&Z|73Sv~p*(_l9_YHp2GX;iT#Xd>^0000<MNUMnLSTY~n;?q-

diff --git a/astrid/res/drawable/edit_titlebar_white.9.png b/astrid/res/drawable/edit_titlebar_white.9.png
index c6f960f3ab02037ffa46cb2bbbe5839e0c024e24..edb98ca7ea808041fdf8cc122dd96d0dd22c481c 100644
GIT binary patch
delta 85
zcmZ3@xSDZ7tRIU3YhZ!Kas~zleNPw15RU7%CpL02DDW^GG@d5b_r~a)x`m?-Q(f_g
p2?_d5oez{!oHHUfi!ZjQ<L69c(^W2da}cPN!PC{xWt~$(699}G8{Gf^

delta 85
zcmZ3@xSDZ7tRJ(f(ZsL$84L^z`kpS1Asp9LPi*96P~>4TC{AKN75{L1QW4iP4p%Mj
pHl>`F^*cMbl0u&6gcUc)^WU4vI^)RQsnI~K44$rjF6*2UngHq29$x?e

diff --git a/astrid/res/drawable/filter_btn_background.9.png b/astrid/res/drawable/filter_btn_background.9.png
index e3b3d5cf9a70da676f004057489763238017c12b..47cde5167378f4d6e66191a5dcea9a3b449b5718 100644
GIT binary patch
delta 722
zcmV;@0xkWi2B-#*Vt*Ab6+Zz000080Nkl<ZSi|j?&u*hI5QjgojR~b3@<(baMe3vM
zn?-rVo_p-ERjU+e0AqU(6<LzfZMtE5>PVK5F#i0T89d{F)6M_oUGUk*gA<}CT07?e
zaL(bq|8y5&7~-5Gj$@jp!CJfNzn8}!#BscCng;JZVHl#6B7X=1f?#;l-g~_FIOnj|
zQr9(7O02aXE6TEL{qphxz<fR@O;h4HMhHO|h99c2*3vW$d7ks|@PKm;A;f{Ips%E=
zDgaii71!6-OeT|0A)PAc9Ccmu^z_92{XIodFrUwPetyPUyO97wi1lPLp{gowZf;nu
zRwPNnS4;?jQhy4qHCk)#?(TSeeB|=-l047fVx+aEEK3%P1<U0Ut@S$}e+4+3%>cN)
zy*&g)QG`;8>2yjQ$8;HYjwMM#6h#Oj0K5bUf&isd7r+lQ>{RQrRBOGDuk1_iGU!}T
z_y2Wk9)P^}SZit9b`(X{+Jg|t<Nv{0`)N9#V%=JUihrDQ`|;lt^+99U@mlX<WQ-Xl
zMs3>;yRPro|C$W_6L<_z=en-M$f4u@T<a9|>)5*(jRiVhM-FAmDHZjrps?!&`mXDq
z&mDt`+P0;ts(&sIL&fk|QE;qitZ@wb7W)DHfPO$Dg3diizXTfN<o?@PN7FQ9S+=i9
zW5A3teScsO0@QWApHNj5#+b8U-g}HOEEWsOvizf{ZQD&z6kJ_h(J5@(_MZUGIm)s`
zN=Y2YyuQA^wcNc)zl0D>r&IDg-#00zG%Edex~^-IBw@K+vfXYe%X0JXYN?c3r)f%>
zrsR1}S(bZWpHjZ#IA%7RA*E!y-Ll*5sH$o+cuOl+O0BilWLd_=#RWo$lT<n9FvhUk
z?I?-@W6U1%;q_lBwT_|)Ddouxe;1#&ZE?;WK)%&}1FB9w;M1(uxBvhE07*qoM6N<$
Eg1_cy(*OVf

delta 723
zcmV;^0xbQg2B`*+Vt)z<3TTRB00081Nkl<ZSi|j?O;6)65Qd+`cI<|bLq8;nREgiT
z_x`&6BF-E+f<Pq+&6n*xpmfs`ma@%qVx&ls;`qrsGnp9&oNoRv&w|fh9$XMb(Z)Fk
zfO8J-{ik0Mh9S;5j4{-8jkR{&e=d(-Fve`^y2g7?7=|dN2!DcrAQ=8=?>*jooO4)f
zsj3PoCDz)H6{Tsqd3kvOU_PIdBnieCgb;*b_@NqWEp=U!Wf>0-4>;!#LL8_H`bx^O
z1YosVaeaNwWHR{_(y4OJQB@UBPfy(6-;?J#^ZA_T=Vz?7YY8BP*i0r9%Ch9<=7!a3
zMI6U`#e@(jrGL;`qqXMl?vBUDM=mcf$+GM%Mp|o%qF}LDuv{+DTEFx0SAetG41n9)
z+e1(kMJT11PNx`S=rZmci{qFmiV#8ocnJ^$0ZOSZfFEYqsn%tw)_Nab*_Yg9(7B-Q
z|LgWV0D14R*3!1^D2lAL2O*Hh|AV#m({w(?y1fP!Ie+K&*MC#g2aRFJd%cTM(=?;R
zsBPO}*Y*ASUz4F<fyV%KuIpNi94hzcTBoSr$KJ(gEYR^jawt<y>8M`?h21RBcU^aX
z?lq{WZClE+{O9&C)C`Y70k9b}8HPY1-()|aAJ7kIM9{f~^h=;ID)(PYP+ixgX}a%8
zW5AlG>3;)*5TL56{erSAX`1FNnD?HhX;>^46h-kzQQNlbJkPnhx}sCqw(UOwoO2XK
zfs_(s46m=RZzFea(Jvtc)9I8f%l1RcDT7LXoUW>hIF4B^mu$CNilSJ*J6bBGHc66@
zBnerTQ541A*Qc~^V+^y|3@Ihs?UvncM_HEZ!Aw)RQfi~MCQVZ=E-ny4oTSP*N7FRy
zc02Msr)io!<iq2?Qfd=L5mL&N2mUTTZQJ6UJAizv{RYGV4FF{-elY+5002ovPDHLk
FV1gixVhsQQ

diff --git a/astrid/res/drawable/filter_count.xml b/astrid/res/drawable/filter_count.xml
index 5f837e693..a9e5af08e 100644
--- a/astrid/res/drawable/filter_count.xml
+++ b/astrid/res/drawable/filter_count.xml
@@ -3,7 +3,7 @@
   xmlns:android="http://schemas.android.com/apk/res/android"
   android:shape="rectangle">
   <solid
-    android:color="#aa282828" />
+    android:color="#66282828" />
   <corners
     android:bottomRightRadius="4dp"
     android:bottomLeftRadius="4dp"
diff --git a/astrid/res/layout/contact_adapter_row.xml b/astrid/res/layout/contact_adapter_row.xml
index 521ce3f09..ef2979ced 100644
--- a/astrid/res/layout/contact_adapter_row.xml
+++ b/astrid/res/layout/contact_adapter_row.xml
@@ -23,7 +23,7 @@
         android:layout_height="wrap_content"
         android:layout_marginLeft="55dip"
         style="@android:attr/dropDownItemStyle"
-        android:textAppearance="@android:attr/textAppearanceLargeInverse"
+        android:textColor="?attr/asTextColor"
         android:singleLine="true"
         android:textSize="18sp"/>
         
diff --git a/astrid/res/layout/task_edit_activity.xml b/astrid/res/layout/task_edit_activity.xml
index 9c1a53d8b..f85a5f593 100644
--- a/astrid/res/layout/task_edit_activity.xml
+++ b/astrid/res/layout/task_edit_activity.xml
@@ -299,7 +299,7 @@
         android:paddingTop="15dip"
         android:text="@string/actfm_EPA_intro"
         android:gravity="center"
-        android:textColor="#ffaa00" />
+        android:textColor="#ee9900" />
     </LinearLayout>
   </ScrollView>
 
diff --git a/astrid/res/layout/task_list_body_tag.xml b/astrid/res/layout/task_list_body_tag.xml
index 91bd1a8ca..0415dc4f3 100644
--- a/astrid/res/layout/task_list_body_tag.xml
+++ b/astrid/res/layout/task_list_body_tag.xml
@@ -70,6 +70,7 @@
                             android:layout_toRightOf="@id/picture"
                             android:layout_alignParentTop="true"
                             android:layout_marginTop="10dip"
+                            style="@style/TextAppearance.GEN_EditLabel"
                             android:text="@string/actfm_TVA_tag_label" />
                           
                         <EditText
@@ -92,6 +93,7 @@
                         android:layout_height="wrap_content"
                         android:paddingTop="10dip"
                         android:paddingBottom="5dip"
+                        style="@style/TextAppearance.GEN_EditLabel"
                         android:text="@string/actfm_TVA_members_label" />
                     
                     <com.todoroo.astrid.ui.PeopleContainer
@@ -119,6 +121,7 @@
                             android:layout_width="fill_parent"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="10dip"
+                            style="@style/TextAppearance.GEN_EditLabel"
                             android:text="@string/actfm_TVA_tag_owner_label" />
                           
                         <TextView
@@ -134,6 +137,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginTop="10dip"
                             android:paddingLeft="45dip"
+                            style="@style/TextAppearance"
                             android:text="@string/actfm_TVA_silence_label" />
                             
                     </LinearLayout>
diff --git a/astrid/res/layout/update_adapter_row.xml b/astrid/res/layout/update_adapter_row.xml
index 4ad40bfa4..202731a93 100644
--- a/astrid/res/layout/update_adapter_row.xml
+++ b/astrid/res/layout/update_adapter_row.xml
@@ -37,6 +37,7 @@
         android:layout_height="wrap_content"
         android:layout_below="@id/title"
         android:layout_alignParentLeft="true"
+        style="@style/TextAppearance.TAd_ItemDetails"
         android:paddingLeft="50dip"
         android:textSize="14sp" />
         
diff --git a/astrid/res/values/attrs.xml b/astrid/res/values/attrs.xml
index f5521c168..b9890b0ed 100644
--- a/astrid/res/values/attrs.xml
+++ b/astrid/res/values/attrs.xml
@@ -11,6 +11,7 @@
   <attr name="asDueDateCompletedColor" format="color"/>
   <attr name="asFilterHeaderColor" format="color"/>
   <attr name="asFilterHeaderBackground" format="reference"/>
+  <attr name="asFilterCountColor" format="color"/>
 
   <declare-styleable name="ContactsAutoComplete">
     <attr name="allowMultiple" format="boolean"/>
diff --git a/astrid/res/values/keys.xml b/astrid/res/values/keys.xml
index 6c433a7a1..74df58964 100644
--- a/astrid/res/values/keys.xml
+++ b/astrid/res/values/keys.xml
@@ -172,6 +172,7 @@
     <item>white</item>
     <item>black</item>
     <item>transparent</item>
+    <item>transparent-white</item>
   </string-array>
     
   <string-array name="EPr_font_size">
diff --git a/astrid/res/values/strings-core.xml b/astrid/res/values/strings-core.xml
index 37a97591e..c885c1944 100644
--- a/astrid/res/values/strings-core.xml
+++ b/astrid/res/values/strings-core.xml
@@ -370,7 +370,7 @@
   <string name="EPr_theme_title">Color Theme</string>
   <!-- Preference: Theme Description (%s => value) -->
   <string name="EPr_theme_desc">Currently: %s</string>  
-  <!-- Preference: Transparent Description (android 1.6) -->
+  <!-- Preference: Theme Description (android 1.6) -->
   <string name="EPr_theme_desc_unsupported">Setting requires Android 2.0+</string>
   
   <!-- Preference Category: Defaults Title -->
@@ -433,7 +433,8 @@
     <!-- theme_settings: labels for Theme preference menu -->
     <item>White</item>
     <item>Black</item>
-    <item>Transparent</item>
+    <item>Transparent (White Text)</item>
+    <item>Transparent (Black Text)</item>
   </string-array>
   
   <!-- ========================================== Task Management Settings == -->
diff --git a/astrid/res/values/styles.xml b/astrid/res/values/styles.xml
index d607b494f..c09c8e17a 100644
--- a/astrid/res/values/styles.xml
+++ b/astrid/res/values/styles.xml
@@ -25,12 +25,16 @@
         <item name="asContentBackground">@drawable/background_white</item>
         <item name="asHeaderBackground">@drawable/header_background_white</item>
         <item name="asTextColor">#ff000000</item>
-        <item name="asDetailsColor">#ff7777aa</item>
+        <item name="asDetailsColor">#ff6666aa</item>
         <item name="asDueDateColor">#ff000000</item>
         <item name="asFilterHeaderColor">#ffffff</item>
         <item name="asFilterHeaderBackground">@drawable/edit_titlebar_white</item>
     </style>
     
+    <style name="Theme.TransparentWhite" parent="Theme.White">
+        <item name="asContentBackground">@drawable/background_transparent</item>
+    </style>
+    
     <!--================================================== General == -->
 
     <style name="Content">
diff --git a/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java b/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java
index 5eec95ba2..ba74a338c 100644
--- a/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java
@@ -113,7 +113,7 @@ public class FilterListActivity extends ExpandableListActivity {
                 finish();
                 AndroidUtilities.callApiMethod(5, FilterListActivity.this, "overridePendingTransition", //$NON-NLS-1$
                         new Class<?>[] { Integer.TYPE, Integer.TYPE },
-                        R.anim.slide_left_in, R.anim.slide_left_out);
+                        R.anim.slide_bottom_out, 0);
             }
         });
 
diff --git a/astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java b/astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java
index 94681ca49..bfb831348 100644
--- a/astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java
+++ b/astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java
@@ -421,11 +421,13 @@ public class FilterAdapter extends BaseExpandableListAdapter {
 
         if(viewHolder.item instanceof FilterListHeader || viewHolder.item instanceof FilterCategory) {
             viewHolder.name.setTextAppearance(activity, headerStyle);
+            viewHolder.name.setShadowLayer(1, 1, 1, Color.BLACK);
             viewHolder.view.setBackgroundDrawable(headerBackground);
             viewHolder.view.setPadding((int) (7 * metrics.density), 5, 0, 5);
             viewHolder.view.getLayoutParams().height = (int) (40 * metrics.density);
         } else {
             viewHolder.name.setTextAppearance(activity, filterStyle);
+            viewHolder.name.setShadowLayer(0, 0, 0, 0);
             viewHolder.view.setPadding((int) (7 * metrics.density), 8, 0, 8);
             viewHolder.view.getLayoutParams().height = (int) (58 * metrics.density);
         }
diff --git a/astrid/src/com/todoroo/astrid/service/ThemeService.java b/astrid/src/com/todoroo/astrid/service/ThemeService.java
index 75ecf1786..bfed2a5a5 100644
--- a/astrid/src/com/todoroo/astrid/service/ThemeService.java
+++ b/astrid/src/com/todoroo/astrid/service/ThemeService.java
@@ -16,6 +16,8 @@ public class ThemeService {
             activity.setTheme(R.style.Theme);
         else if(preference != null && preference.equals("transparent"))
             activity.setTheme(R.style.Theme_Transparent);
+        else if(preference != null && preference.equals("transparent-white"))
+            activity.setTheme(R.style.Theme_TransparentWhite);
         else
             activity.setTheme(R.style.Theme_White);