From e119dbbc93e49d7aa8924cadfa528096106e5ddc Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Tue, 20 Mar 2012 11:38:55 -0700
Subject: [PATCH] Make the locale edit alerts screen always dark themed:

---
 .../astrid/locale/LocaleEditAlerts.java       |  10 ++++------
 astrid/res/drawable/locale_border.9.png       | Bin 1197 -> 1399 bytes
 astrid/res/layout/locale_edit_alerts.xml      |  11 ++++++-----
 astrid/res/values/styles-locale.xml           |   2 +-
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/astrid/plugin-src/com/todoroo/astrid/locale/LocaleEditAlerts.java b/astrid/plugin-src/com/todoroo/astrid/locale/LocaleEditAlerts.java
index 719ca7840..ee38c277e 100644
--- a/astrid/plugin-src/com/todoroo/astrid/locale/LocaleEditAlerts.java
+++ b/astrid/plugin-src/com/todoroo/astrid/locale/LocaleEditAlerts.java
@@ -10,7 +10,6 @@ import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
-import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.Spinner;
 
@@ -25,7 +24,6 @@ import com.todoroo.astrid.api.FilterListItem;
 import com.todoroo.astrid.core.PluginServices;
 import com.todoroo.astrid.service.StatisticsConstants;
 import com.todoroo.astrid.service.StatisticsService;
-import com.todoroo.astrid.service.ThemeService;
 import com.twofortyfouram.SharedResources;
 
 /**
@@ -100,7 +98,7 @@ public final class LocaleEditAlerts extends ListActivity {
     /** Called when the activity is first created. */
     @Override
     public void onCreate(Bundle savedInstanceState) {
-        ThemeService.forceTheme(R.style.Theme_White);
+        setTheme(R.style.Theme);
         super.onCreate(savedInstanceState);
         setContentView(R.layout.locale_edit_alerts);
 
@@ -118,9 +116,9 @@ public final class LocaleEditAlerts extends ListActivity {
         /*
          * Load the Locale background frame from Locale
          */
-        ((LinearLayout) findViewById(R.id.frame)).setBackgroundDrawable(
-                SharedResources.getDrawableResource(getPackageManager(),
-                        SharedResources.DRAWABLE_LOCALE_BORDER));
+//        ((LinearLayout) findViewById(R.id.frame)).setBackgroundDrawable(
+//                SharedResources.getDrawableResource(getPackageManager(),
+//                        SharedResources.DRAWABLE_LOCALE_BORDER));
 
         // set up UI components
         interval = (Spinner) findViewById(R.id.intervalSpinner);
diff --git a/astrid/res/drawable/locale_border.9.png b/astrid/res/drawable/locale_border.9.png
index e1dd0cec7dc83d5bca581fa4626289707b413b42..0024c8fbbb6d8cf91923f797504687a7b57fcf90 100644
GIT binary patch
delta 1381
zcmV-r1)BP;3HJ(+BYyx1a7bBm000XU000XU0RWnu7ytkTDM>^@RA_<inonp{R}{v-
zNzx=loe*5esM)xf1P2mPLn2IYQO19TG>}CW6|xYCAP8D;VW4)Sw1Sl`N>R{C?V?e-
z8EZkojSE+bSTG?e8JvmJbduOQV=9w*_uXF?%^O<jIFn{#rhhaaoXvap-T8jpa~^lj
zeLg_tkk98^(nNr7Nxxq%kd;=|N*gGb{<k2zBwdj-Ch4UlvrO^3q@N^xE~!;gbunY5
z)<~<QGm;Jfb-<E~vzV%?s*og~&*w_|R?>%(rVBo>VCqfr0WfW?wZ<4mMn*Vy?i^iR
zT{JW_AgQd;(0|ZCXJ;qp&z~nAkK?*73;G4vU&v=Mi1&aTKr)$RU|@jy`g$Uf2+?Si
zR4PR-m&0}4C5JJFY&Og6>?}8L-sHf614!cJ$&<{@&0(#zz|TNru^?N4pRBcZWMqUu
zAV5b)2Y2t@Wqy7hV+_WavOv5J1YnHe&Ye4K*|LRDD1XGGN00cEg%?26VnBWXY&;&P
zt*wpj?rsu^L>}Pb!-pI@c8txNH&b0*z2uZyyLK%tEiIflae~p&QC!!>TFb=51d&LD
zU@%B7mjkfCH$Y7(AZ>tgU6&(Ajt~lkNT<^PJbn6<-rinnYirA1A70ed)Nts~A*QCL
zFvc)8Hh;#34I3C79Q0PqS;&~8AYTJEkx1b8`-w)QSZm2-GPJd|EgQh=(b3Vt?CdPo
zT5jLIO?7oO@p#;;mrqLpNm^?;d-g1Q_wL1U9J1Lg`}gmEYY<)>K72S|JK=DcOP4O;
zx~>I&ECs|^YYBxyM59rRF+6zi;H^V=X*NDSj(@e5>({TdZ{I#Iy?!eN#9C{SL^7Gg
zaU6~wJ-Q+wk{B8q!WhG|XU|x_e*ItTq$mgglJc+EO`A5Y7|8bR+cC!Q>eZ{fC&2s-
zL=yj$TE-X_?&YCYD%P!Am#>pTAT=r?k9H;X^5siOlFwIod-tCJDMkO=|05NvRgg;4
zDt}0&X%(c>v<gybS_P>zt%6jVswlCCTT@eX$G>c<t*tFOrs#^et}97uZf;(>qkpNE
zmKI6U{QP`Ds5gSt*Vk)iW=4Se`ufW6utXg^cu;_*r>7MN1iZ`6U&j;znfLj8+O}<*
z?%%(kpRBH~Zu#66(3&-C)YH==NxFCMo_{(!JH1=K|7~D_F3N<p)?T=9f!(`zlg(yv
z9Ebk?{<q$E7#tkLaU3$43_Ex3<nraqi)zq)VXd`eV`J3S)p6_AEgZ)okw~y-&z`pi
z(c9b0%*+gq<1jotOjA=6u~-aitqXio3dlC#l`+N+3=GiT-p=UgC;)SFbM*D~Eq^;i
ze}BK%edqDx#{`2xPMtdCwSs;Hf~9~6_|95uQ>hezK!9Dlc9BY@^2Z8Ko;>07>C<#|
zb<x<^xMbr^O-+QuVa}X6!}$1k{#YTIOtN+BR=T^pNvG3Z1N+O@{k{pL6_^2t#bWH(
zv4dbR$nfwmxm*ro436XE!O9ihoPW7ojvF^_uyNx?!r?HJlapSrZ~|yv42XdDfq84K
zot&KH`0?X3Ha61U-p<vlSBb@9q|@oLL1Z!+CMG7hc<~~wt*!X|eujpIc=6(ew-VDp
z_dj_p1|r~H;E8t_IyE)LwQJYt>FFs;O1&O_zn@4X!j&smc>eskmtqze0bas|e3p7V
z9hCHuq+Ur4rEY7Ms)g@cvXZ`%^s%Iwf@2ri5^a@qNYeX~nkBuX@^3tml#}#K()W@+
nlQdcEq1BISDov{(m8L%c^;D{;b&;D*00000NkvXXu0mjfPzJAG

delta 1178
zcmV;L1ZDg83atr{BYy;RNkl<ZXx{CbT_|O17{|wV5;_>kXOtcL0&z7pbK^uEht3Ud
z4vFGgisH%zH4>9Dku>R?b3vKp!snGJ<f9M==d`7Kq!}4s+h%P0ndkq`dUunV(^=bI
z_L`~n)IVGHdf)f=JkR?s>v`4_B6^~Q*vK8ZJ-=2UddmR$p?^Wxp0VDrwpkY}`y<K9
z`j^$gN@4kE0-_A|mSywy_ICLA_(1fS!aNYqdCU5f73mfT+wZJ*3IL_1rc!NfEzQl%
zk=1G?tqo(&&(Bj$O%27z#{)>7Y)7nL9t6VnE9)Z$ijIz^zP>)P*=#g9IY|Wt1r!+>
zNq&BQVlsCHCw~P51W<T*IOXT()5yq(0BdP!p`f53QlfLn%5e#V&5S(70Eoij;UO(7
zEKqiKHu?Mef0+WB3S+`?_?eTFLl%pL*4Ni5BO`;nyu9$YQ`S$efQ+&n2=D6ZDosyM
zQ(Rn}6Cg7)lR7#&Xm4+i>~_1`DRpsiL0el})YjHUDSs&`0tyRHN=gzLu)V!4qK`GP
z{$lz5F9=&2P7e&$)zu|D5)u+3Je81;Ktn@AbaQh<k7c*Fx76F)OHol#!f7UxiH?qr
zsJpvcMhpjlSq;b^AV&nw&d$VsfOmp}gGF>aWk_Z08O)uVn=2x(8~}()iyDvvTwGsY
zPvhg`<bUhyD>mZj=qP#GdU|@CduL{5hAJy7@fjd%YC!A&K}sPS7$hqzi}Wz0S#ol+
zh)PjW5si(F$@Kc52E>62VK{aXk<QLe(#x8fn#AH`Vq)m{_}IBm)PTr;t(`~g{{Fsh
zAj`|kVjY2jfzCA{YwoT2>t_Lc316nqzc``vvVZgQbLT#JFbGmirkS25Z<r4T`EmdQ
z!~iis3=jjv05L!e5Cg;jF+jcxkpFsSzYl_EXT1!iC$~XlNpxptM>mkQwKcH@Jn90<
zWf0VPQGCGX*49?tK<eu1#2Qc>+}+)kAT~81R(Jpv_rk(LabbFTI$d91dmQ5O@=}yg
zv44ir(oz~27?2>xYCtTg=2cf$)6~?ID9)iI)ZgFlaS)VAF*mB5i;Ig?QBmPif$lXx
zP;*5T^78V;U?`zZOiXwT0yXA{hzK!vad9!7oSaZ%Vj}j-9k21F8juXu6%XJ*Ph@3f
zMT8eeHF_0;gM*I_f#@sMcS=i36V>?U=6`0HRwpcz+P1=5L<P+p^hRc9XGLR2wiV1~
zGc`6gihXo?dg}JV;ce7*8yXr!iBz@~aM)~YY>2i7Is!@oyUUgS2>OQa;Sq#$X=zD#
z1tEr~0E3Wg-8+<HVh$WM2L}fNFg7+;77Hz`IC8P|_8aR4Ucf-@?d`(*NVT%EGJgRG
zFKGpV4UNW5RaF&jZf=T}2I{_{p`kJo?^rMBfz8mLSsSt$isnm6NeK-P4{MTA_YI3j
zhpN21oWjDw<Q*Llf3u#Go9$_n((byHm3mJ|X|rA76lFan4PO|*zG-FsgFCCz+;?cK
sJ7sLVF!1VI`+<yCI1CU2#AST~%M<680@J=E{{R3007*qoM6N<$f-k2kEdT%j

diff --git a/astrid/res/layout/locale_edit_alerts.xml b/astrid/res/layout/locale_edit_alerts.xml
index 7527014bb..20418c5da 100644
--- a/astrid/res/layout/locale_edit_alerts.xml
+++ b/astrid/res/layout/locale_edit_alerts.xml
@@ -3,7 +3,8 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
     android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
+    android:layout_height="fill_parent"
+    style="@style/Content">
     
     <!-- At runtime, we'll load the Locale background frame -->
     <LinearLayout
@@ -19,7 +20,7 @@
             android:paddingBottom="10px"
             android:gravity="center"
             android:text="@string/locale_edit_intro"
-            style="@style/TextAppearance.Locale_Label" />
+            style="@style/TextAppearance" />
             
             <FrameLayout
                 android:layout_width="fill_parent"
@@ -32,7 +33,8 @@
                     android:layout_width="fill_parent"
                     android:layout_height="fill_parent"
                     android:scrollbars="vertical"
-                    android:cacheColorHint="@android:color/white"/>
+                    android:background="@android:color/black"
+                    android:cacheColorHint="@android:color/black"/>
                 
             </FrameLayout>
                 
@@ -42,14 +44,13 @@
                 android:layout_weight="1"
                 android:gravity="center"
                 android:text="@string/locale_interval_label"
-                style="@style/TextAppearance.Locale_Label" />
+                style="@style/TextAppearance" />
         
             <Spinner android:id="@+id/intervalSpinner"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content" 
                 android:layout_weight="1"
                 android:paddingBottom="10dip"
-                android:textColor="@android:color/black"
                 android:entries="@array/locale_interval" />
             
     </LinearLayout>
diff --git a/astrid/res/values/styles-locale.xml b/astrid/res/values/styles-locale.xml
index a7b890768..57ed90a13 100644
--- a/astrid/res/values/styles-locale.xml
+++ b/astrid/res/values/styles-locale.xml
@@ -12,7 +12,7 @@
   <!-- Locale filter list styles -->
   <style name="TextAppearance.LEA_Filter">
       <item name="android:textSize">14sp</item>
-      <item name="android:textColor">@android:color/black</item>
+      <item name="android:textColor">@android:color/white</item>
   </style>
   
   <style name="TextAppearance.LEA_Header" parent="TextAppearance.LEA_Filter">