From 4e1b06ebcf08dd57240a56bac6f923b2e72ea793 Mon Sep 17 00:00:00 2001
From: Patrick Scott <phanna@android.com>
Date: Mon, 16 Nov 2009 07:50:20 -0500
Subject: [PATCH] New UI for the list of alarms.

Still need to put the "Add alarm" item at the top and the clock at the bottom.
---
 res/drawable-hdpi/ic_clock_alarm_off.png      | Bin 0 -> 1663 bytes
 res/drawable-hdpi/ic_clock_alarm_on.png       | Bin 0 -> 1633 bytes
 res/drawable-hdpi/ic_clock_alarm_selected.png | Bin 0 -> 695 bytes
 res/drawable-hdpi/ic_indicator_off.png        | Bin 0 -> 458 bytes
 res/drawable-hdpi/ic_indicator_on.png         | Bin 0 -> 613 bytes
 res/drawable-mdpi/ic_clock_alarm_off.png      | Bin 0 -> 1013 bytes
 res/drawable-mdpi/ic_clock_alarm_on.png       | Bin 0 -> 1018 bytes
 res/drawable-mdpi/ic_clock_alarm_selected.png | Bin 0 -> 511 bytes
 res/drawable-mdpi/ic_indicator_off.png        | Bin 0 -> 307 bytes
 res/drawable-mdpi/ic_indicator_on.png         | Bin 0 -> 380 bytes
 res/drawable/indicator_clock_onoff.xml        |  24 ++++++++
 res/layout/alarm_time.xml                     |  80 ++++++++++++++++++--------
 res/values/colors.xml                         |   2 +-
 src/com/android/deskclock/AlarmClock.java     |  50 ++++++++++++----
 src/com/android/deskclock/DigitalClock.java   |  11 ++--
 15 files changed, 127 insertions(+), 40 deletions(-)
 create mode 100644 res/drawable-hdpi/ic_clock_alarm_off.png
 create mode 100644 res/drawable-hdpi/ic_clock_alarm_on.png
 create mode 100644 res/drawable-hdpi/ic_clock_alarm_selected.png
 create mode 100644 res/drawable-hdpi/ic_indicator_off.png
 create mode 100644 res/drawable-hdpi/ic_indicator_on.png
 create mode 100644 res/drawable-mdpi/ic_clock_alarm_off.png
 create mode 100644 res/drawable-mdpi/ic_clock_alarm_on.png
 create mode 100644 res/drawable-mdpi/ic_clock_alarm_selected.png
 create mode 100644 res/drawable-mdpi/ic_indicator_off.png
 create mode 100755 res/drawable-mdpi/ic_indicator_on.png
 create mode 100644 res/drawable/indicator_clock_onoff.xml

diff --git a/res/drawable-hdpi/ic_clock_alarm_off.png b/res/drawable-hdpi/ic_clock_alarm_off.png
new file mode 100644
index 0000000000000000000000000000000000000000..76c19e59789f3b36c01f415876e9b65952eea81e
GIT binary patch
literal 1663
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
JPDHLkV1mIF8595j

literal 0
HcmV?d00001

diff --git a/res/drawable-hdpi/ic_clock_alarm_on.png b/res/drawable-hdpi/ic_clock_alarm_on.png
new file mode 100644
index 0000000000000000000000000000000000000000..8304d6106d9c1e5c72a55fab328c033f8e8bce59
GIT binary patch
literal 1633
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

literal 0
HcmV?d00001

diff --git a/res/drawable-hdpi/ic_clock_alarm_selected.png b/res/drawable-hdpi/ic_clock_alarm_selected.png
new file mode 100644
index 0000000000000000000000000000000000000000..ddcaea16a3d79415934d7d6f020a8bd93945d3bf
GIT binary patch
literal 695
zcmV;o0!aOdP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!SxH1eRCwC#S?g`YAPjD*4!{Owgp80*
zaM_?4p(A92>jpPMdK2U}NH(CI;JU#zRE`uO1I9r55J>)k0=7S6W9(G7+wJZzkE#GD
z015yefU2sR&2(PqGmwQ?s9q<F9v7A(8UU4+p_Lx=HiWtWv7Lp7=G_G8L{wZj6kqAO
zkR&KCVXcdomL-w^fMZr3ftp4DN^zZ$z)#DpqX2*~MG(|7ytgIt7BK)$9+&AI3f2%a
z%{Ew((R*C#!~y`;w=!KVV<>!FXmaeEV9oaSS!KD5B{%>Yi=WrXI*LzYyc#6lFkTG@
zfHZuuL)IJ_ikoyq_;yBoNNx=DKmu{EiEyosK)!2pvdH+BADssRl-E{!vE%~@-xL)@
zvP5P87%bKf&BWNL3|Rqy1u@InGVlas%gESCzGMLau5-l_jq9nk-Xe~ytdP?bIRNyC
zwQAp6(F0(;I!(TP4gd<vkg)(P8DFJ-jbc`k2?0p#bSb*s6K@SufqB{do~o(>Ub9Cg
zI;a31jrlo4b$Is3M8^Y>xf!f;pmNWMMPH3FboR)M0$`5N`WH)b7a%UrC;)=E&Q_?;
zh{Z)t0JGr&`gq?6`<?=HVYw+ah(C<^Awv)!JTm!hm54k*k{^=?a%W;HfV`PF;w?n=
z{axNdoYyGjHrwYl%B%-`9lHJMfqzkv5o_YkQ4@E+p(dtuBtp9qy8<{R=moLbh$(`&
zbyzP{S=*jACxFq?C*}4=vC|xL0vIsAjp$Be@igQFu>IMg5@uo*@>63=<u_{qPyiGF
dKRdnz7yv<}@=vY4M3Ddh002ovPDHLkV1nI8CUO7(

literal 0
HcmV?d00001

diff --git a/res/drawable-hdpi/ic_indicator_off.png b/res/drawable-hdpi/ic_indicator_off.png
new file mode 100644
index 0000000000000000000000000000000000000000..1ca71d9fe7cdd6f04916ae5b14a30c634e1d4d9e
GIT binary patch
literal 458
zcmV;*0X6=KP)<h;3K|Lk000e1NJLTq002J#000XJ1^@s6$h1{t0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzY)M2xRCwClmOW0xKoEuZ&#^7VC}p5<
zW2kZmL`9X36CmXboF+#|gIrlOTmuOjkSyc_BzEH6<vrs-u8<w+dDmmP_}<KpEvu>$
zP1A_BZLh4gchI#E!i(@iYOUX)*VSrOGoiNIEx{Lu!{HI&MWEmePd;+4*XsonrtkX;
zxUqE339NQ9nK)yNlTr?ED5cKU3@{B4-g^N~wcqa*3}6Q=H=E5DIL&R6BqGbQ4y#Sm
z)J9R{PYpQha*yDsxZLe_8eOij*W@<S>9hdwA9x(cth|Ri!L&cC4FhD?b&3X1U@XjR
zHZy3C7SJ{{=wpzHA|H#3B0C)CgzzokJ==p5aa=`UgKs#$fR~T}ya#-1FyKDX5(NzC
zM+f|PR)T?-|HF%032@H34_-<np8&5R3uYJSr%wEGD^2BjUK*N$^H3u3Kyb*0`jdmu
zGyr-Y5_Mf4pWFca9=Z&;^54+Qd_I5U{f__x04-+3u(W#5zyJUM07*qoM6N<$f{xV2
AK>z>%

literal 0
HcmV?d00001

diff --git a/res/drawable-hdpi/ic_indicator_on.png b/res/drawable-hdpi/ic_indicator_on.png
new file mode 100644
index 0000000000000000000000000000000000000000..5a99970bd3b69a1a4becf5237f94129b30fa379f
GIT binary patch
literal 613
zcmV-r0-F7aP)<h;3K|Lk000e1NJLTq002J#000XJ1^@s6$h1{t0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!2T4RhRCwCll{=5qKoo`V%XVI@HW3X%
zRDeW915{Lq28ot}6<Wbc`~f;Tv?VPPB_&jW0+fb|l7<FRz#l-OU?m<}i9kG@d&kZu
zzaa8Xay|0Q*ztGH@r3WcAzJ(;qC}T)+(+GH!IAMrb-Bg!JBQ>FrI{E#dU`E=i21!&
z;I8Qw;Gbhb$%;k3SUV2S>jKD;0CP6F^W<up^1UgY2KZ-8j2u`E3+za(uEVzi1i16$
z{x{AqSVWxxE*V@4Ocu?;V-WpTh}O(Th>>x%&wDTFJ5DC<ww0)=abAxJc+*ssN*R%H
z2`(jJJ+J`R7027y^Lli;X?TV(si?1G>f3g}`&goSVgNsY5Fvn9y!XgIV$odO?d@Jj
zsgMB;Z36f)X}}ZJ>E927%QFD)uD%nM$3uD^4f4yo>%0U*3HY9FqaOmkfb00A#cNI}
z(SvuRKY~1%G2+iOC?>H`urS|1mJwQwQx=yuyORY-T8<#jacrIEaJ~vd3+aQ#e0IKj
z_C@8pJzY7qbNlPz$EhfbnNrWTsL~VhehB^){RV9c+MYv@T=_>f(;Pg}qH(hZ`Xc%e
zC4}H$Fc>LOTA!@W-3@J8)!u)5cH_&>w~y!P*F^_+l?snOl#1OE0yuEnuM4obmKx_B
zG-@e89`k1l!yv#w$Dhs&FF!oLb$#a7{uf{X$RBj&TmndK00000NkvXXu0mjf*j5y1

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/ic_clock_alarm_off.png b/res/drawable-mdpi/ic_clock_alarm_off.png
new file mode 100644
index 0000000000000000000000000000000000000000..742c074053a6a0b5c6f76db5e08fc829d88bb46c
GIT binary patch
literal 1013
zcmV<R0}A|!P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#mq|oHRCwC#S1nNEKp0Kh0Hp!S6k;%h
z8O+6CilrJX)%7)J&YVJ=I)gbAkB+|6#W7TrVWx%|8Vn}W&d@gf;rHIl?B1k6(x!+r
z?95KK$$sy9-?wkS-KsAyFUtRH>L-C|2>8Bl;*nKV)yrnHUfkS%zi$B3;853f_d^8W
zxb*z|T*T0TbA>&fPM>5lncwft9}b5HPft%}VhUU@l}c4X#EJ5eiikq*cDp|TRua)j
z=L!J7M1tWP=Ws3?ZHYlFVosd_8X$6$Kme89!*6F{VWAqA($Q#C1ST_QpeyY30eg3O
zdHMT90$^Hve0;2kh!hc#gL!`z7Z?3br(<Hghi;Amsj7>9y0Wt34h91q<9!lA1_Ban
znx@&%&{zQ48%C;XgrYvjE3UbBcXww2xP;%9)I%uMbYkIo&~CRIAnoLGIR~1k!f6@b
zc1eQR6ElDmT6mP{80l{C9YBi!s7M_MExab6Fj{tzayy^TSEDee-iEDKs|e5v9nQ_o
zu~XSpbq$&Eh59M50!Wk|9v%$zfDnk<Yin!OnYSS#w*Yp;@%;R}LIGk8ZTTI`vdbsZ
zeIC+Kg+jc)zYl(c@DF67k!Tyr2InORGDtVpa?Cj!zU{Mz-*FD-(uTIgi1U$(NxcaG
zt{qe9VGG%>=Y$H*SmRvU2$B}D5)**o9wQKfdbg5sojE6>C~@ls--(r&0EA~sMN@E5
z1Sq(OR->)h8Ic*#qCUv2#lE__>c4BOX`HutdwY8%w<v^aLzEtEAku%8FfjqSuPLUe
zhMnP(M5u@bBtltK!j&))0fLb^Q;Z1pjg5^rSwPu6iL$2+ZHXZZRw4}`GMCX41SPnT
z^rAr<+KMggCMJLaa?12Fec}vAN`NO~pc7&xCV&#^vTn2dvb<hiURI`c&bhRqEis5S
zQzeA4!xGFjWO=RE>k~<E4(HNFlyB!lcfzZyt0L|Ij7T2A9@6SS?X{hqoj{lu7Z*Cz
zUO>SKZcxNz^w^H}_V#w{VWds5mb!FKP~H!DI`ZAw*;%;qDRN8ln-H%)2|t#=_4Tz0
zphJ#v8&Z~*mV7u02+1-nx2zBwMeFx^Jsqc_f)nwu*=(L~ZEblo5ddHTXTFYg44mV3
z`xU9*WV(503=`m;kIRB@HyHmSQM}hdjJIlMCIX1M0RUf+IbL61=eQxd5>v#ELHe7p
jYkdAS`y>$8{t7SvS59n&NM;Bs00000NkvXXu0mjfF4)b=

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/ic_clock_alarm_on.png b/res/drawable-mdpi/ic_clock_alarm_on.png
new file mode 100644
index 0000000000000000000000000000000000000000..f81d9f670d7f9517e3a70c7c210c26cd241151f9
GIT binary patch
literal 1018
zcmV<W0|oqvP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#oJmAMRCwC#S4&drKokv#_(3!Uj2J<c
zbMkh8D|oO1$qLjJU{>JU0k{HrD}X7pP!6rajGQUq=a1hzr>px_R1yphta|mjsw*UY
z@44rG`gRjpEEd{#j;Qv{<J$?uJ|i?9j}1KZNF?Iy?(RB4vX76CIixj*pKc<Nuvdb!
z2K?q|G&&y)2Dg}t;c&RX`{L>8>C{i2Ym}iZb*M{>ARCcoMF=nS*=*Lt8a>zGxfYE^
zwT+DpJ{$3Pyu8er*Vosp`Fvi2u7;<ku%T~5_XyE*KUD)X4gg_X8OC$~WcnHB;2LEp
zE6IxQ#3JT0oevR!_m$~%TJstQs0F!SJ3Bir!fN36v5L-LAb5#+xxc?}BNeO{rmCu<
zAqp-QGZBS)U=czwN5gV9@ab%Od)w*v`$Yg(@m^#~)Kql@BSkz<A08fBAZ;BS9GpKt
zKi6UOf@vWMVy}$A%gaj<j|&>!+S+RI8$c@nsL`NIhamWl08=L>-?46{QmMKhrZ0i_
z<Np4>0?--_Zf<UJI{0m2se#CdqJpP79`v$0nM`t+f)I$B>2$gtgda!%o)-bulm(`N
zeH}S8)jHBr;uGO+cxtEyk1N;_;vIyK5Q)}Woe;*WC`b`*<noPi4y>JUdcRSIvecn2
zG1h9u2)zLS=1y$EWHM>`HL>@Dvec0zi^K{|0E)--Ko*p>Oon-;%u-<JP?zh(3QYio
zXQ+y1!TAwj!TF2^b>+@5LLWwIYjNtj?k-i1#VBXo-Q6|S7Db_&C`yMqDAG4AITQi4
zuT?wsX}vZ{c$%0X;fbQ=?S!ES5RA+jVtA-$v)K<(K-)d@)29w~#fc{yR;U_)XEwbj
z2wHF{>_vk*)RkM<4ov_J<dWfK_~aQ7mOz!d#2{8^0%)N&`!?Gz+w1l9b?vjpDN7yd
z5`$Q4bwVgxY{ASS+pBHcD@jm>vec37+gkf9;JCTDso)MkkJJ(DAgmUuy-_F>L}7M1
z9p0cyXgF2g2Z>4Vu^r9B!^8TQE~UI&DB}dh$nkW<w_3a1_I5r^ZAr?@;?-B-2S%XV
z?HavauL&?6hm5wjx97r;Af(!~+Oo3PShOxKqB>4RzPmUHf8_IdXRQbTpoBADM;?W7
zT(k2CJzMlo-t)W!K#Uj9-&o`Jy(Lk6*FmfTk@K|(;11XVz=<SN&SWyoc}q?$pox`1
o`bz4xzEp(&{~P}E1pWvx0M{&_$PsT(t^fc407*qoM6N<$f`(n%(f|Me

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/ic_clock_alarm_selected.png b/res/drawable-mdpi/ic_clock_alarm_selected.png
new file mode 100644
index 0000000000000000000000000000000000000000..197325bacdc3b13c2eb0649602bc9d35c898f675
GIT binary patch
literal 511
zcmV<b0RaAqP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzp-DtRRCwC#S8H*@Fbr;X0}u!qgFrBY
zg~2ig9RnA^AOu1?1c9(JNExIIGHIvmbUIsB?OpR@^PMiKqQ@s$mfUJtmfe=?VYl(x
z9KfSRsH&<K9yQPfw(OFSZQy})1=(}bIMzUnV0oYk#Te}s`Mr=uU9b9x7{X{jg|U^6
z3V>ro2W{2200=q9XnHLg((MCT`vzeGKnA3;Un78p_3#cf3PN7XGUx+#dJ6!qh$(G|
z@5s@TAe3>W(}->H766X6z$LPhqF%G9)<9xQCgRniXhVCSu9<{$Ckzhadxs==gV1p$
z0LGYe_I(WSIfyX}09E@>+7*Cf<Qw0PHs(j01uyLVkkRH35nJYA)Ux+e27pt<*6qUx
zQgzjU!T=iC?^hgHr~~}pnTE<b-)kJ#p)3IJP17m8knrfbjNm#`rb>=sqKBA{VNoMe
z^vWBNr4<{Tm$l-13?s`akk#B!l!M`%*QJ+IEX0{bG#l;#Qobq4K*yrMKJY}Ko&)U_
zkJ<-4C(>KD#^+|hQ518km~!>1|Nn-69>A9X0|4=IM(l4!%kcmJ002ovPDHLkV1gm_
B;w1n8

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/ic_indicator_off.png b/res/drawable-mdpi/ic_indicator_off.png
new file mode 100644
index 0000000000000000000000000000000000000000..c1aa867778c1bb9e2962e51d300f3c8f100ade49
GIT binary patch
literal 307
zcmV-30nGl1P)<h;3K|Lk000e1NJLTq001fg000LF1^@s6e(~S40000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUy)k#D_RCwCVl06H9Fc5~lkosK_QL|)o
z>(HfB!9VG*>RzzBqgYB1Db}j#n_tnqaD?0~56>MnO>-QE;p#Zf86_OM(xdK0QQSCk
z$+E2WeSb@m<mI~VPDJ{jbXsd#mW7Su7|rusgK^<ySypizD^Py`x}vFVP`R!v0hD9g
z-ZV`Wmr{mln!Y{H+ilvp5r$2FqbS;xQXv;Y^o+3_Gujbj-V#;<7Yl-bAh9<$+TkzF
z0JmWkD8dX6{B<0VE$V>g3C-M0ZJ>lSBkYOifw%n$FaVS6P!3v=FP;DZ002ovPDHLk
FV1oF)fqno0

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/ic_indicator_on.png b/res/drawable-mdpi/ic_indicator_on.png
new file mode 100755
index 0000000000000000000000000000000000000000..361364bc2edb0cfaf1a5175313d8b078e4ccf626
GIT binary patch
literal 380
zcmV-?0fYXDP)<h;3K|Lk000e1NJLTq001fg000LF1^@s6e(~S40000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz9!W$&RCwCVQ#o$KFc2IWELMO6kU)w!
zom&1UF9?vvk8tu0eL-D{{3LuwI<sKm(dr^-Td|QQD+qgyIHM(5?Z5DhgtrL12;gCW
zm;lDO8q<i^xb$m1^<0O1H{r<{<N=*LqOD#(@y^o0y0L49#U@d)&(lJp^~@{LRKp<R
ztUnR2tfTd`3<Tp3^(I?<RGjFyIC!c?ZAQR<u`~_Nh7CvSsdyH7%y9R{r5*p6Lj=||
z{p&Z}lQ3-gaAN8VcW+!0)kXc*T#b4xA4j1znqZveVcpt;V8;>5jLXl=Tua$yFhxH*
zSK7;KE8B`oIL#d#p2*i<p4b_RYy}N=((u+hk0i@SC5gG>f2&;*w}#UnRULs*7t>FB
a5?}xeq-BiFud^ip0000<MNUMnLSTX}tEKY*

literal 0
HcmV?d00001

diff --git a/res/drawable/indicator_clock_onoff.xml b/res/drawable/indicator_clock_onoff.xml
new file mode 100644
index 0000000..f44563c
--- /dev/null
+++ b/res/drawable/indicator_clock_onoff.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_selected="true" android:state_window_focused="true"
+        android:drawable="@drawable/ic_clock_alarm_selected" />
+    <item android:state_checked="false"
+        android:drawable="@drawable/ic_clock_alarm_off" />
+    <item android:state_checked="true"
+        android:drawable="@drawable/ic_clock_alarm_on" />
+</selector>
diff --git a/res/layout/alarm_time.xml b/res/layout/alarm_time.xml
index 6db55d0..24a485b 100644
--- a/res/layout/alarm_time.xml
+++ b/res/layout/alarm_time.xml
@@ -16,61 +16,93 @@
 
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:paddingLeft="5dip"
+    android:paddingTop="4dip"
+    android:paddingBottom="4dip"
     android:layout_width="fill_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    android:orientation="horizontal">
+
+    <LinearLayout android:id="@+id/indicator"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingLeft="14dip"
+        android:paddingRight="14dip"
+        android:paddingTop="8dip"
+        android:paddingBottom="8dip"
+        android:orientation="vertical">
+        <CheckBox android:id="@+id/clock_onoff"
+            android:focusable="false"
+            android:background="@drawable/indicator_clock_onoff"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:layout_gravity="center"
+            android:button="@null"/>
+        <ImageView android:id="@+id/bar_onoff"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:paddingTop="4dip"
+            android:src="@drawable/ic_indicator_off" />
+    </LinearLayout>
+
+    <ImageView
+        android:src="@*android:drawable/divider_vertical_dark"
+        android:layout_width="wrap_content"
+        android:layout_height="fill_parent"
+        android:scaleType="fitXY"
+        android:gravity="fill_vertical" />
 
     <!-- A layout that displays the time.  Shows time, am/pm (if 12-hour),
          and an optional line below, used for day/days of week -->
-
     <com.android.deskclock.DigitalClock android:id="@+id/digitalClock"
         android:layout_width="wrap_content"
         android:layout_height="fill_parent"
-        android:layout_weight="1"
         android:gravity="center_vertical"
+        android:layout_weight="1"
         android:orientation="vertical"
         android:paddingLeft="8dip"
         android:paddingRight="8dip">
 
         <LinearLayout
             android:layout_width="fill_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:baselineAligned="true">
 
             <TextView android:id="@+id/timeDisplay"
+                android:includeFontPadding="false"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textSize="30sp"
+                android:paddingRight="6dip"
+                android:textSize="36sp"
                 android:textColor="@color/white"/>
 
             <TextView android:id="@+id/am_pm"
                 android:layout_width="wrap_content"
-                android:layout_height="fill_parent"
-                android:gravity="bottom"
-                android:textSize="12sp"
+                android:layout_height="wrap_content"
+                android:textSize="16sp"
+                android:textStyle="bold"
                 android:textColor="@color/white"/>
 
+            <TextView android:id="@+id/label"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:textSize="16sp"
+                android:textColor="@color/grey"
+                android:textStyle="bold"
+                android:gravity="right"
+                android:paddingRight="8dip"
+                android:singleLine="true"/>
+
         </LinearLayout>
 
         <TextView android:id="@+id/daysOfWeek"
+            android:includeFontPadding="false"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:textSize="10sp"
-            android:textColor="@color/ltgrey"/>
-
-        <TextView android:id="@+id/label"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:textSize="12sp"
-            android:textColor="@color/ltgrey"
-            android:textStyle="bold|italic"
-            android:singleLine="true"/>
+            android:textColor="@color/grey"/>
 
     </com.android.deskclock.DigitalClock>
 
-    <CheckBox android:id="@+id/alarmButton"
-        android:focusable="false"
-        android:layout_width="60dip"
-        android:layout_height="76dip"
-        android:layout_gravity="center_vertical"/>
-
 </LinearLayout>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index e61b6c3..df2c9cf 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -20,5 +20,5 @@
 
     <color name="white">#ffffffff</color>
     <color name="red">#ffee0000</color>
-    <color name="ltgrey">#ffe0e0e0</color>
+    <color name="grey">#ffaaaaaa</color>
 </resources>
diff --git a/src/com/android/deskclock/AlarmClock.java b/src/com/android/deskclock/AlarmClock.java
index e9d5e78..f2533c3 100644
--- a/src/com/android/deskclock/AlarmClock.java
+++ b/src/com/android/deskclock/AlarmClock.java
@@ -25,6 +25,7 @@ import android.content.SharedPreferences;
 import android.content.res.Configuration;
 import android.database.Cursor;
 import android.database.DataSetObserver;
+import android.graphics.Typeface;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
@@ -44,6 +45,7 @@ import android.widget.AdapterView.OnItemClickListener;
 import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.CursorAdapter;
+import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
 
@@ -68,6 +70,17 @@ public class AlarmClock extends Activity implements OnItemClickListener {
     private ListView mAlarmsList;
     private Cursor mCursor;
 
+    private void updateIndicatorAndAlarm(boolean enabled, ImageView bar,
+            Alarm alarm) {
+        bar.setImageResource(enabled ? R.drawable.ic_indicator_on
+                : R.drawable.ic_indicator_off);
+        Alarms.enableAlarm(this, alarm.id, enabled);
+        if (enabled) {
+            SetAlarm.popAlarmSetToast(this, alarm.hour, alarm.minutes,
+                    alarm.daysOfWeek);
+        }
+    }
+
     private class AlarmTimeAdapter extends CursorAdapter {
         public AlarmTimeAdapter(Context context, Cursor cursor) {
             super(context, cursor);
@@ -85,17 +98,33 @@ public class AlarmClock extends Activity implements OnItemClickListener {
         public void bindView(View view, Context context, Cursor cursor) {
             final Alarm alarm = new Alarm(cursor);
 
-            CheckBox onButton = (CheckBox)view.findViewById(R.id.alarmButton);
-            onButton.setChecked(alarm.enabled);
-            onButton.setOnClickListener(new OnClickListener() {
+            View indicator = view.findViewById(R.id.indicator);
+
+            // Set the initial resource for the bar image.
+            final ImageView barOnOff =
+                    (ImageView) indicator.findViewById(R.id.bar_onoff);
+            barOnOff.setImageResource(alarm.enabled ?
+                    R.drawable.ic_indicator_on : R.drawable.ic_indicator_off);
+
+            // Set the initial state of the clock "checkbox"
+            final CheckBox clockOnOff =
+                    (CheckBox) indicator.findViewById(R.id.clock_onoff);
+            clockOnOff.setChecked(alarm.enabled);
+
+            // Handle the "checkbox" click and toggle the alarm.
+            clockOnOff.setOnClickListener(new OnClickListener() {
                     public void onClick(View v) {
                         boolean isChecked = ((CheckBox) v).isChecked();
-                        Alarms.enableAlarm(AlarmClock.this, alarm.id,
-                            isChecked);
-                        if (isChecked) {
-                            SetAlarm.popAlarmSetToast(AlarmClock.this,
-                                alarm.hour, alarm.minutes, alarm.daysOfWeek);
-                        }
+                        updateIndicatorAndAlarm(isChecked, barOnOff, alarm);
+                    }
+            });
+
+            // Clicking outside the "checkbox" should also change the state.
+            indicator.setOnClickListener(new OnClickListener() {
+                    public void onClick(View v) {
+                        clockOnOff.toggle();
+                        updateIndicatorAndAlarm(clockOnOff.isChecked(),
+                                barOnOff, alarm);
                     }
             });
 
@@ -107,6 +136,7 @@ public class AlarmClock extends Activity implements OnItemClickListener {
             c.set(Calendar.HOUR_OF_DAY, alarm.hour);
             c.set(Calendar.MINUTE, alarm.minutes);
             digitalClock.updateTime(c);
+            digitalClock.setTypeface(Typeface.DEFAULT);
 
             // Set the repeat text or leave it blank if it does not repeat.
             TextView daysOfWeekView =
@@ -122,7 +152,7 @@ public class AlarmClock extends Activity implements OnItemClickListener {
 
             // Display the label
             TextView labelView =
-                    (TextView) digitalClock.findViewById(R.id.label);
+                    (TextView) view.findViewById(R.id.label);
             if (alarm.label != null && alarm.label.length() != 0) {
                 labelView.setText(alarm.label);
                 labelView.setVisibility(View.VISIBLE);
diff --git a/src/com/android/deskclock/DigitalClock.java b/src/com/android/deskclock/DigitalClock.java
index 383ca7b..38ed91b 100644
--- a/src/com/android/deskclock/DigitalClock.java
+++ b/src/com/android/deskclock/DigitalClock.java
@@ -66,11 +66,8 @@ public class DigitalClock extends LinearLayout {
         private TextView mAmPm;
         private String mAmString, mPmString;
 
-        AmPm(View parent, Typeface tf) {
+        AmPm(View parent) {
             mAmPm = (TextView) parent.findViewById(R.id.am_pm);
-            if (tf != null) {
-                mAmPm.setTypeface(tf);
-            }
 
             String[] ampm = new DateFormatSymbols().getAmPmStrings();
             mAmString = ampm[0];
@@ -113,7 +110,7 @@ public class DigitalClock extends LinearLayout {
                 "fonts/Clockopia.ttf");
         mTimeDisplay = (TextView) findViewById(R.id.timeDisplay);
         mTimeDisplay.setTypeface(tf);
-        mAmPm = new AmPm(this, null);
+        mAmPm = new AmPm(this);
         mCalendar = Calendar.getInstance();
 
         setDateFormat();
@@ -183,4 +180,8 @@ public class DigitalClock extends LinearLayout {
     void setLive(boolean live) {
         mLive = live;
     }
+
+    void setTypeface(Typeface tf) {
+        mTimeDisplay.setTypeface(tf);
+    }
 }
-- 
2.11.0