From 464202047d6813e7559ceb8e73aceae0b15da1d9 Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Wed, 17 Apr 2013 17:47:09 +0900
Subject: [PATCH] Add user feedback to setup action labels and icons

Bug: 8159728
Change-Id: I46c77c31973ae492c2a12291f2e0b154f64d26c9
---
 java/res/drawable-hdpi/unbundled_check_01.png | Bin 0 -> 1358 bytes
 java/res/drawable-hdpi/unbundled_check_02.png | Bin 0 -> 1451 bytes
 java/res/drawable-hdpi/unbundled_earth_01.png | Bin 0 -> 2373 bytes
 java/res/drawable-hdpi/unbundled_earth_02.png | Bin 0 -> 2680 bytes
 java/res/drawable-hdpi/unbundled_key_01.png   | Bin 0 -> 1554 bytes
 java/res/drawable-hdpi/unbundled_key_02.png   | Bin 0 -> 1569 bytes
 .../res/drawable-hdpi/unbundled_select_01.png | Bin 0 -> 1636 bytes
 .../res/drawable-hdpi/unbundled_select_02.png | Bin 0 -> 2098 bytes
 java/res/drawable/ic_setup_step1.xml          |  30 ++++++++++++++++++
 java/res/drawable/ic_setup_step2.xml          |  30 ++++++++++++++++++
 java/res/drawable/ic_setup_step3.xml          |  30 ++++++++++++++++++
 java/res/drawable/ic_setup_step3_finish.xml   |  30 ++++++++++++++++++
 .../drawable/setup_step_action_background.xml |  30 ++++++++++++++++++
 java/res/drawable/setup_step_action_color.xml |  30 ++++++++++++++++++
 java/res/layout/setup_step.xml                |   2 +-
 java/res/values/setup-styles.xml              |   4 +--
 .../latin/setup/SetupActivity.java            |   9 ++----
 17 files changed, 186 insertions(+), 9 deletions(-)
 create mode 100644 java/res/drawable-hdpi/unbundled_check_01.png
 create mode 100644 java/res/drawable-hdpi/unbundled_check_02.png
 create mode 100644 java/res/drawable-hdpi/unbundled_earth_01.png
 create mode 100644 java/res/drawable-hdpi/unbundled_earth_02.png
 create mode 100644 java/res/drawable-hdpi/unbundled_key_01.png
 create mode 100644 java/res/drawable-hdpi/unbundled_key_02.png
 create mode 100644 java/res/drawable-hdpi/unbundled_select_01.png
 create mode 100644 java/res/drawable-hdpi/unbundled_select_02.png
 create mode 100644 java/res/drawable/ic_setup_step1.xml
 create mode 100644 java/res/drawable/ic_setup_step2.xml
 create mode 100644 java/res/drawable/ic_setup_step3.xml
 create mode 100644 java/res/drawable/ic_setup_step3_finish.xml
 create mode 100644 java/res/drawable/setup_step_action_background.xml
 create mode 100644 java/res/drawable/setup_step_action_color.xml

diff --git a/java/res/drawable-hdpi/unbundled_check_01.png b/java/res/drawable-hdpi/unbundled_check_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..8234399d5e1dfa73e288fe06409a72e0243e189d
GIT binary patch
literal 1358
zcmbVMZA=?w96zWI#s+cg#$XV79!h3HdvEQvJ*lkiwa~<NP-?8YY#i-DFK{orUTGm@
zt7x)-aV9fDM8!bDmMvx&!{Qv_WzJ;LWDbJK%)X4p1**<$8skic(dVE=KahR!a(B=3
z{O|w!{oik(DbP?{w7&>~pkiMm69lUfJXM9;!28ng!|#KoT=j(27O7oLvI++|qf#3O
z`vkUw3vz6<=h)X=9R%rOd?>7j{V&oHNieaRjwvO`01ZKP^(mQ+baE=(#&z(b1Gzsv
zhroQ)fxK+-V}9Aq#rVcvg=^^zgd)A25qlJ=e*vyb(SShUR2EJNU1FS0IgoW;8tgSO
ziookCYNrF)a4PI?g58qB!4?x~j9@qpQ<MoeTPO;zg$WENPz>CZ5jWEoiYBaZ_CkO)
zCE8908E@7WI607*s>(EqCX-21k~B$52a4P6c8!A|j6lN}?-5ltWfbGpIR=J{M-*OG
zc}avdMz&2#s15{px)FjP`~925VmzBDkTNvI$|!EaP(je*TGx)NLGE8Sw$zS?dSng_
za&al4L_j^-t8-wGyT=>S6oEJNA%zD;VY?V9k`Opi^)U_vd@)7&DD5RIBuTj~I8I=c
z4aaQ+;j|Nk#bc#x1ZKx`99v;s4CQ2Sm(A`X865WzHk`58tOQA#&7|3eS#nsP7*|;_
z!sYDpz-|_6eJqxCD;%pzN=TBravjhVlT;}llVsT4Lcs_8Y=jpz!E;)HHsWPCh41E~
zUPTh%^$gSe79M!aZmSn(%mkB-9J7&js~g9hHjf$eVn`Mn{XbblfitMq9{*{VoCx%w
zw%u%gaM&ClP6RWffZ^Et=};d8<@Na(XDD^+yYI&WR}WTR`?YvzV1Sjw_jb3o6}d)Q
z@8lI0R@PnlQvU#YrmVKeS}^`}S$;lQTXHgwTs(N{_6h#o-&Vz$*CuD`hx@Kid~v*+
z|NNqVBIN!v?75kF>TSO5jv;-2VgKM_y5@uaB(0mgyE58*^ryhX1)Xkg+;MKW0iD@1
zRGzAs@iF`QC&m)X`=;J2Sc+{gXvlnIsAbPu56|!J9+^!_%{NOcd(W=spJaZXk5tG9
zrb^b{q=fk;XZ;VKJbV4a$!(dIzpCE3uzFWNozZ#rrmGFDr)uQWCd&Ez=oLLU%(8FQ
z{8+H-$(2mWpyO&{`O#+&i$Bhkb@$!Y+X6Qh9}Jwi75ggi$1jDGJG)#r`VFttj?9hC
zywNdsuJm&7#I<9M@~)9r&GUy`uL}$1YeAi%G~Mu0T3FoUxOlW|xkjEoKc_Pl=+_SG
z{ywk2H~1~xveIl%9husGWXGkQBXn`znQvxGE5;LQ`t;>d<oFY1(2~ANAKvlEp#9-|
Lo&a;f)!P3LdzjNE

literal 0
HcmV?d00001

diff --git a/java/res/drawable-hdpi/unbundled_check_02.png b/java/res/drawable-hdpi/unbundled_check_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..6ccd07b55ad19f25b39d4972d4e33f1557427c59
GIT binary patch
literal 1451
zcmeAS@N?(olHy`uVBq!ia0vp^x<D+)!3HFEe3?EINJ*BsMwA5Sr<If^7Ns&crsOB3
zDtP85rl$s_CZ<#to=ml2U|`P342dX-@b$4u&d=3L1gX)h$SnZsW?-<fuP8`N&Q2{+
zNJ>r5%(GQ`zk9!uLS~AsQn;zFfp39xYDT6<RZ(him0w75Rd%vvijuvZf=z`L(16_3
zl0=1y+?>2(s|s5su(?)1Hb_`sNdc^+B->UA;;0DU00rm#qErP_J!9Qu14BavGc!Fy
z6H_xYLmdSp14AQy10XWfH8im@HM24@SAYT~plwAdX;wilZcw{`JX@uVl9B=|ef{$C
za=mh6z5JqdeM3u2OOP2xM!G;1y2X`wC5aWfdBw^w6I@b@lZ!G7N;32F6hI~>Cgqow
z*eU^C3h_d2fv+#z;JjjJKmmhHzap_f-%!s$KQ|ZTFR<$3lAu(CGq9>I4yi0i)elN7
z&Mz%W2F6F4GE6ft?C@IzQV4X7m48ttFj5k8T=J7kb5rw5JY8&+fHHb1nJHFoMyAHb
zX3nODhDHWv7KVlvMn;a7Mn<Nt=4KW~29|~}GqCD4voJTb1gdf}b}=+`HL@^tF|{x^
zGB!3bF*dO<Foo&$%quQQ%u7y%*_#Qn7p&LN4X<7+=c3falKi5O{QMkP3JA!^FUc>?
z$S+WE4mMNJ@J&q4%mWE%f+7gwUzgOP%(B!Jx1#)91#k#kWnyuGtBJF@o1u$|kqgx4
z1{TJa=FWx&jux&a25tsQP`xSSgql9kG5Vn7fs|ZeLclZ#V!{(YkOR*?sd>OWQv}Q$
zdeUC{3=E7nJzX3_DsG**Zts2AL4xf=#M=w5;_9)ntfB`!CpIZ95<Ti$BEa&$wxMbF
zBlZhxyPLc3M!CvF9ds1f-Zi^fL2qu1RY-PCTt(|^)68{eRm<7=ug6^e@cOiB`OCuC
z>zUWp^6g{~=d$c{+BQ$TUCU%b!J9mmeeTC52yt1YTK|%_Idi=E#LlxX0-ppj1XnwU
z<+uv(I5JiA;N}^Z<;@l`AKbQZ?*aW2JsiufrCVC?7KGZ}Z1eK}(KvC{b$*}lS@U+6
zd+gV`QL=P5(`=XOMs2Nx;0*l_!bWSEzPTjV${R4ubKe)DKWV}N$&&XkE(<nXwmRUO
z!S-BmRf*v7;#mh>WfOK@V)vM2zkEXWKjmEqG-VSc_jXNbeXJ60w^;Iz0Nb6GV?~k9
z+mC$qYs=4I3Jw%I)DWHL(x$J>%2{_&@eaR_>&n)-`MUi!2VTFprdrYT@HW@=B`-^)
zMQ@ZBCjO8r(wsZn`5V)L%7<;&`0{ouG5vGSKOl7H;rA`I!4D3k%6wouTzn}!-NTF_
zrh{qCE>qPXe4l#Xa6MMPv;SAa%Y7@{H;M<`_1|ryDz%5Bvq0)~FZZ37di@XDPpmYN
z)827=ZRRy*IcbYCb+aD0s~t$ZFW5gZK1Jqc54X=-{{}_|v#V2IC_A?~gNjd2S3j3^
HP6<r_(y|2P

literal 0
HcmV?d00001

diff --git a/java/res/drawable-hdpi/unbundled_earth_01.png b/java/res/drawable-hdpi/unbundled_earth_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..3d22f3bfcd5d9787edc863d42e01c20a9106b7ca
GIT binary patch
literal 2373
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
X&OWtf>^ZST^JC-5_GXp4a#Q{Sxjf8!

literal 0
HcmV?d00001

diff --git a/java/res/drawable-hdpi/unbundled_earth_02.png b/java/res/drawable-hdpi/unbundled_earth_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..1998aea56268200d6c5e590a122be8f0edb59bc6
GIT binary patch
literal 2680
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
T_TPdo{tMFmLur+i=wtr@T|a@+

literal 0
HcmV?d00001

diff --git a/java/res/drawable-hdpi/unbundled_key_01.png b/java/res/drawable-hdpi/unbundled_key_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..84591ecb7fa4d61437d9ebee130ab06999aa327a
GIT binary patch
literal 1554
zcmbVMdr;GM9FHJOogB34ZsNeKp6DiRUTxY&N-a%!=!yv3Srlhu8)%d?B}r*P=BB47
zIG^XS^DV1$H`$KifT0r=AIKE(sBXBS&VxPOv7zU7)2X-=soNi(e=L{e_xpYG{d~Uf
zROe)8#Egp{2LM1!RwkJ%txD;cH6~hm512=-mzK$*#U|!)MWT=5X~5*<meF7qOBK_(
zH03NWJx`|qK%|Sww~03E8-#;nRa8hv<!3z-8URv^eh=kXL5turx|ner6obc3DnQ0*
zP%P9~VXMbXyO_)hp3bYt&UaL-aOj;1V=9>9CnN%v7AerrmbeANZ%_>L64E{-h7{ni
zinzj{c;b}Jngg0So(454OzD6T1jKO_qSoLzk_@6Sf<mx#<4QzLXmA46f+Lqgvc@}$
zh+Hy##Flh2C|siGAt1=-^QnB8isOqRM6cI}I8an6X()wqw@CSwZed!Ofusco&v-<J
zbAus9Y8mGh4GPKACn2yNtMw_dTNp`{lrqRqc_2guLo6GLYgk(lbLoHGc&4_HU+$ry
zTw36~yhEx-(X=pF%H8t~g%l-ki1|Dt6@@AxIfs{}-C`DLP)J`?PR2>3qZ$mu%^Czj
zVO)nGIuteOQB-5m;yM)8BVmqbVbe&h#$wTu`ZSD05DTh9NR3X5VwhTusdca>jLmWj
zBIS0_VY`fEcLZyGE|xI!G$nF;KF5`WJ0Qo!iJai#JfJxb2WMI-2jdP2UJDiINxUS@
zGi9_ho#$9^IKu?<3=b@7vo;+e)hIa<IjqC<S~CKhbQU$74l72m&i|7&NOA@Wwa0(j
zB`lJ9FtmNz{L<m+_|R@?W_W2hzQnfw0RRzmvPe_Dzjt8A?0J!<xDIH6Y4p^C(X#0?
z<0rPCzHs_<T8TP7YPNAx^ZvGTGf7ir^x?R`UT~3Xdf?vc6WeE`-q}+l+f3svzHhG;
z{t&&Y5Ix#qY;0VKO+l?f7rb%R0Z(#5MDW7}_LuN+-4VgnzdTO*!glA;xz*$Q1|xFo
z5(E7CV^PcBnSZKkU!?5h!Hzw1;6~2gvqf)U?>^Xg^YZsEyG9TE?j3XXq5Rh5v8T`j
z?`tkw+hjk_dSRb#X@cj%zTJbFgK=wiT4g6NduQw|Q%pIw6<E}|W9!ikL-JO&{CaTt
z-L{NW3kPV|8aH<==x<qR*X$1*`l>2o@4cgw^47IDPmql@RQ2sG-&8(kcf$R>76|xM
z9#~%`e226&znk6r!MXk3+NA{>j!b$hs$?#y-~INKt1KHRKFoJonr>Be;Wr9quY4eo
zY<;!->e=fl*R8*m0!^}^xwWr$dS|pn_T4<w`d8BpxfM)u-Td*<E7fK3%!FCZFRtq{
zk6wJZVc`VifX(xHO=dww)rNbiwfX&jYwb&N?*Cb_EpcG=*Jqt|?R_=PM1N%uTsUv2
zG-KPFvWr7U&IES>Wl=F{+kefB1v=Mg7q?tWNGb>hHtiUbeQ|4c@UxFI<~GQ%PZl?9
z-&54(GW1Oqy5Bn<$92cnx6-3NY7<T-56NqjulAlfq?CI*4Dk8;b+;cTUNX9l7c>|X
zs(KofMa5feyB2M#Y4NokY+txGA>~?k<xffMad+^-m1#@tyRH}`#sl`T{e~vWJ}UH=
N&az~a^=bAs{{U2aKd}G+

literal 0
HcmV?d00001

diff --git a/java/res/drawable-hdpi/unbundled_key_02.png b/java/res/drawable-hdpi/unbundled_key_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..f366e524c835c2b71d31350c766215724db7276a
GIT binary patch
literal 1569
zcmeAS@N?(olHy`uVBq!ia0vp^x<IVW!3HGXI5V~bDajJoh?3y^w370~qErUQl>DSr
z1<%~X^wgl##FWaylc_cg49ppsArU1JzCKpT`MG+DAT@dwxdlMo3=B5*6$OdO*{LN8
zNvY|XdA3ULckfqH$V{<S3ODsN@GWpo&B*kqDoPEm@(W3>%1*XSQL?vFu&J;D8jzb>
zlBiITo0C^;Rbi_HHrEQs1_|pcDS(xfWZNo192Makpx~Tel&WB=XRMoSU}&gdW~OIo
zVrph)sH0$HU}&Uo07PcGh9*{~W>!Y#3Q(W~w5=#5%__*n4QdyVXRDM^Qc_^0uU}qX
zu2*iXmtT~wZ)j<02{OaTNEfI=x41H|B(Xv_uUHvof=g;~a#3bMNoIbY0?5R~r2Ntn
zTP2`NAzsKW@b!fooL3ADC}5E3S0onb8|oS8=jMX^1y)^L5|oN?23FO@A(aKG`a!A1
z`K3k4!1zd0hG_<d9e#^I3W2V%@-NB+MoMCiOMY@`ZfahMr;Du;P)08$GsViy$kf=_
z%-Ph?(8$2d!qCvd$jH&s$jH>y+|0trz|s(A1~$DG#-@g5=5EH8PR6c=hOR~yhAyTS
z=0?WGCML!v76zs;y`Fi+C5d^-sW5vpf%Zc68sXJz<y@4SSdw29lAoUgO925H`6c<q
z8TkbY&cS918or6inRy@qO;7|u{Ogihlv$RV;#QQOs{jsRt4u5|a5Zr@cQbS`F>-<W
z+`z)v(%jk5z|q3h#K6r!392`RoKVvTIz}IqJdlzLObD0;K}>k!2Xf%qCp8b4XNrKC
z<IWMoBnAd1e@_?3kcwMxB2RiTI||HoVHJ$wlXG!lZqm?jV{WSWs&KGdyF>1eRQ<u(
z;>mX$1bjvKo2mo@0|fMynxy#ic0B5eQWceGdo^>Osj%n4<VohXlds#ZuU=)<=%F+<
zKty#_ioZ&8q?&}XRLCZSqD94v{?C3<)BfI^>qf#4vjc17UGFnJYVdz{NAiJCz)SP$
zGn_2RHNovQ&tG~re-5q_u4TGmma&=N;?v{|nWOUT^V*g#O6CbaQ&4#F+)lkJ_JT7X
zgquQBF7q$i=^n@bg56|?q2k-Fe?ogqewn(Lo?*5#(yZbwIQzl2L?-3jUFK=VnzJ^$
z=`NURXFe%3MQxq>qWKKnJoX76{;p41B=|k%3)6#8rxN|k&*tuVyYt12M$=1zYWEDg
zBSd>8Z|^#y@%m%*mb_{;E5DhuWiQ%?U4OIS^feFn)sw|G2C>L6@k#t+yRfMEF7IL4
zz;EJZ(OWV~<UAUt{%*ayr9D;t)sZa;brxz;-PgF=UAx1Sj=xd#dbFFNRp|PD#xT~I
z@ypkAIH*jV<a_EPyY`9QuU0V4nf;=|^s*dxoA$}R*-|f6-8NV)p4@AAVBP|U6~$3o
zGOkLPXjZj6sG8O;ZK%!DKU-h6>$swJRoDi>%k7^JWnbL%?Ld;rkq^#lr#6Z6hI^$>
zx7vG@QDfn@c&&X50V!om(ixWX+)`bC{D0{wlLMZ%>mFvUs4bs$yEp7n;f>x}{`e{@
z^;>x}DwS__y3b;MmBDm}F-S|VU#sHIg_>(Vw<gTJa>eUG*M&15p0cc4aAB*v(dj!A
c|A;0qSb9`P<=OvR2P(8ZUHx3vIVCg!0MukQz5oCK

literal 0
HcmV?d00001

diff --git a/java/res/drawable-hdpi/unbundled_select_01.png b/java/res/drawable-hdpi/unbundled_select_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..3887fe4916032058573d6e9ccfcb869f3e8e09ca
GIT binary patch
literal 1636
zcmeAS@N?(olHy`uVBq!ia0vp^+91rq1|%QG79Idnk|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+m@_g%B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+*
zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn
zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxSU1_g&``n5OwZ87
z)XdCKN5ROz&`93^h|F{iO{`4Ktc=VRpg;*|TTx1yRgjAt)Gi>;Rw<*Tq`*pFzr4I$
zuiRKKzbIYb(9+TpWQLKEE>MMTab;dfVufyAu`<jAm(=3qqRfJl%=|nBkco*&`K2Yc
zN<f!FypUVq>kBtHuNWFoz#!AFNG#Ad)HBe}%?0@jth%@)C>7xhtg4GcDhpEegHnt0
zON)|$@sXws(+mtd{1$-}0$pR}Uz7=ql*AmD{N&Qy)VvZ;7h5Huj9yA+ij|v%xtpP(
zxru?fk%5_op`nG5k)x%Nk*TY>nT3&or6J4=Y<i7cjZH00jZ7_F-CPX~U5zZ9O<bKU
zU4R;$%pIK!U0`}W^NLFn^O93x_GSX@h3YlItJli8C^fMpzbGU>KL?fq0y6ST@{2R_
z3lyA#%@j0z6O%LZKmwYe2!i<6CABECEH%ZgC_h&L9Ku$aSX^LY2n5c~riN}%pBq>h
zTRIv$ni!gznwh$pDna$8kP~Y9K*#8Vk_S?9fe8WAAczT1{6G#o`=sUp^Gp#ibM*K2
z^D;0nP4aYc45_$vXXainW=E0M$)1S^IvlUxa%(==uy)!%+ZNxdY}W3Kr8Bf9oMIO^
zdQO}pDKl~L0)fS?*R&);nwr+6Kje!!=KJkk|D=xx+7;i;v7LG6&ApkvyVuR`S|}93
zusMONr#W!~WBdYMIS1i6jll(?KXc-4Ot4tM6qRRk_d<pGo1KScY?xjxc&xUV?`N-v
z@sifm05;PHKmNSuo73QZf$97M-X{k%G#Vr~aH!QBvu`xrAitfb=)r;Xus8=^pY}gm
z-X`nbKCX0l-W|f0{NRqkAC}z;@(Zt7-ut2TvvBU^O6S(EY$m*mxdVD6FD>!d7jrhR
zad++4XFYOFIfoogBR`p^Tc~qpUwa|v@jocQch<S&YX#>wq|TT8`*wlN2Ft@w^Ah*I
zzPmVZ@lAWKQ{GM2KPd0#`^^0M*!q1xjywMB?~7M`l@@V)hjFNKOjp=J!@GX(U%ofo
zEB`Gh-1J=uAAhu=-jATqJU1BDGj6{YZlx#u=<sK0_ty5OzMj4r793KFzZu{EP+VBw
z+nfDzgX-Z8DswKn9bsFhIOn1KPLW&9m5VheewqC`K{F|Qm&@bk64%Nt&-QL8e$y-5
z=qZ=8>``WSP1BLjXEa}Z*s90MrhVn#(TfT{SvsH34B8@cF^iLDTJTAaN5!Y(`n98s
zGi|wfmI-rdf2>Se-!7{AZp%FuHfGM&sXsp0NV={L(Dl@<QxORRy01nvN-w*Yi)S53
z@x$zW+ZL7X4RcJm;GwbRNcyC`bpcx#7n&*?SO{G!)89MUe?rB)WsBwtt#xfY$bF+z
zvTQcUNpm8vN=IBTjl6z7YHQGjEZ(%cudc1CWqw_jvgY>dO<Cd>cm2J&@6OME;patu
py~^wjJ%4aX>IHFsiT$h+3>q7bU-NVO2uz&}44$rjF6*2UngD0-Z1Dg9

literal 0
HcmV?d00001

diff --git a/java/res/drawable-hdpi/unbundled_select_02.png b/java/res/drawable-hdpi/unbundled_select_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..6a99b6b095fe83006af3911c35342417b6d3815b
GIT binary patch
literal 2098
zcmbVNX;f2Z8jdU;c3BDp7$F91u|SfWl>`#VPJn=f#Xu<~Bo`7P3(2KPK(VMpsdxrC
zcB&`>R*Oo-g@P*}mO-Q=FmzBXf<&c&)v{I?w4-yQ;LHzCf6RC8z2Ejc&%1o@ckUOP
z<M@tt-gXEC!ch>#5y5?s`L$UKe;<6D-vM`C5LXN(s<R=zL<=IAGIbV+5-24(pa_)6
zjQKraI09iQS0srcu`re<RVy(PGX`T&YG5`35guXCNTj(SgvtVQ6e>D;=IS*xN+F}8
zw~&N5p@t306;Xv+FtIQ$Nm`gIrOMC|3{<#*1`8-bNP;pb^He&TfsTHyOM}PeWh@%?
z8Up3g(Qlj*3pb<KYAuK&VF)2o8~~umWDGzgk;y<X3XcQuSRDM2LjWR;M5f^>sFj9>
zt!ZW1G!cilVhf(p(Q*jV(6Cs&UXRfeFlucM7NAn8W(_<(1V)7Dj4DWC2vO<$R~0y*
zPO4RCAcb0mGAl~5)CCY74SV_~1f@nOd@HQdtt1Lg8P*`tU;zvct5llfdX3gWBJjU%
zyc4ZUGHO7q2-K+yv{Lvyvi(=daPI!tkQoSjLyOlc;6st*an#ZRC8&Y~96B1_!N?Rc
z8ZVT>0{{vUN5SLBp#Tty$1|yTJc&yohvIQmU{&K?Ts)URqLT0cmCNG-02d$1CURL+
z4oqZGm@I&^$`z<|kVGW~SM4fbyDMDWA987IEhvH1+9b6)Z?yt8%hixtCs%7w>_jpu
zP$-cqROW?E<^y^YF9*~rJ_Thwty+nCone~d9Uc$?xUtzJfVUDkE|frJ5|~7QL?V-T
zB=ibb_WxuJ3p;}~m&gB<%jyzbgXZDe;)f@1uMen#?~E3{9N@W|#}NptOaX_PWEdVy
z6-Ff|IJal)-yPhgb=&RJ7{J`QGwl-2{`=$>0^8QI(Zkj{CCUE9cTp#~;6K(0emXN8
zz~q*DShu)1#C#NxaJYD?yTj&`+7w1wf4@jSU9@EDxUIE&ZltRJvTowmtsrs!q;lV`
zL5tkak~>6ou7TEeB?^;0ZcQt~*K%EnOQT8gPu6$mQ&XMO5fDNdSx~y2b*WnHMAU6}
zKq4>*zlTUC=~MS(CrT(Cl{Q~j$$(l<`iU)0Z9x|q;!KBKDRmVY&wh5FMIh^k7#8~@
zZE>~ZzkJ54`><=_;pnK%=OyVqd#)GPb$xU|+-jA+wx)aUTw@10vu5eylgJOE;<MQo
zERYr{CtGSeHkkrush{skT?>`-OVBMZ9pn}dmh!Vw${6!yP74Lo{gv{L$)$v`b7`JM
z70%u6DNP%Hn{sU--~5f}9T0SEFzn==zfC*a91!1JEb^tV%Ue^wGu$R)`MqbgOW`Aa
z+zYqEV(0y4tctCT?>WEZh7EUy%&Kx}O+UxR(|Gq5goFMg(_Na{zRp8WH~f{qWBx{!
zUG`?AYj5+6>hEkus{YR}mn*V--xqN2l^pJfF_9wF+P2`e4-#e^^&MC3iK!dXPP@Le
zJvPmnh`CJbU*ltxCeQ2qhsHFY98EZT_tg(GU44~*$vZr3=sC!rMCeO0>aU(WeD1)D
zN$=L6MQp=2Wd4OaLD6TB^g<u84<UF6PYm|G6W-ur*TTARJt&&zuxC-mOme#~ot?H>
z4plfeeS7<R%SRI0zDL(1<l)ev{$KXFxA!$B{Fqmk5YtNWSyV7$*fk@O$#V%!n4`^G
z2MA}{x0F7us@_Hn6o2KMTJAf#_+{z+o@!#?!6W8r?+KjDvtdE<<?m5tr@0jqg!S_`
zwD_?)laVD0DTMl$Hp)IZ8`d9q`G6U{Jyp2-Pm!Ug2!WR*dw-3cKT`NLXTj*A6+JvY
za5rLoPvujI^xsF9!=0!<=8L-0HbfuqY^&Wk@M0U|SX79q*UPu`v^6w8x)m4bC1ZQ+
z24B68wfx4dSDL=ndJ8%ud54^G|DLP<Nl9BNvSys|)2m+7ZM+l9qPM@YtuF1L$m55S
zflg5%*5XsdMFSW=yWlb8nLpN?puTwMZfxaPgqxSwm0v}4@yEUsR;QwwW8ad3Ge?e3
zI4nZTj?#)N<>d#{_T)54tOl}%Lqsji_=f34x14xdx1c-`$L83}<0n(9FvZc7aiodZ
z-;-_1Yq#A$l{&1`j{5DY_x3B$9-8E&J<eUWvu%H#+x%$U%gE`w63|OLKQrW8Y%v&c
ztEIHCh2N!0Y@jNyRGzrSe?nh(b#DB8D7)NY`^cPW2AN#c%$VMG$3-=pC60T{h)aLo
zH08Z@dBh59OONshb9`L(+(_R4yXUn{@=cTbPWvD2oKV&K9;v|#s%yXENIcK>S!T?+
y@o)UAb?R}Gt9#D`Kg_7)e^I?dve*BbH4;I2MyfP+<rJC!;sS0Q=L{=z=YIf<FhPI-

literal 0
HcmV?d00001

diff --git a/java/res/drawable/ic_setup_step1.xml b/java/res/drawable/ic_setup_step1.xml
new file mode 100644
index 0000000000..e26afb3ca0
--- /dev/null
+++ b/java/res/drawable/ic_setup_step1.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2013, 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_focused="true"
+        android:drawable="@drawable/unbundled_key_01" />
+    <item
+        android:state_pressed="true"
+        android:drawable="@drawable/unbundled_key_01" />
+    <item
+        android:drawable="@drawable/unbundled_key_02" />
+</selector>
diff --git a/java/res/drawable/ic_setup_step2.xml b/java/res/drawable/ic_setup_step2.xml
new file mode 100644
index 0000000000..46db293064
--- /dev/null
+++ b/java/res/drawable/ic_setup_step2.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2013, 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_focused="true"
+        android:drawable="@drawable/unbundled_select_01" />
+    <item
+        android:state_pressed="true"
+        android:drawable="@drawable/unbundled_select_01" />
+    <item
+        android:drawable="@drawable/unbundled_select_02" />
+</selector>
diff --git a/java/res/drawable/ic_setup_step3.xml b/java/res/drawable/ic_setup_step3.xml
new file mode 100644
index 0000000000..4ff9fd933d
--- /dev/null
+++ b/java/res/drawable/ic_setup_step3.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2013, 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_focused="true"
+        android:drawable="@drawable/unbundled_earth_01" />
+    <item
+        android:state_pressed="true"
+        android:drawable="@drawable/unbundled_earth_01" />
+    <item
+        android:drawable="@drawable/unbundled_earth_02" />
+</selector>
diff --git a/java/res/drawable/ic_setup_step3_finish.xml b/java/res/drawable/ic_setup_step3_finish.xml
new file mode 100644
index 0000000000..8ac8a86d12
--- /dev/null
+++ b/java/res/drawable/ic_setup_step3_finish.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2013, 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_focused="true"
+        android:drawable="@drawable/unbundled_check_01" />
+    <item
+        android:state_pressed="true"
+        android:drawable="@drawable/unbundled_check_01" />
+    <item
+        android:drawable="@drawable/unbundled_check_02" />
+</selector>
diff --git a/java/res/drawable/setup_step_action_background.xml b/java/res/drawable/setup_step_action_background.xml
new file mode 100644
index 0000000000..25738e3a49
--- /dev/null
+++ b/java/res/drawable/setup_step_action_background.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2013, 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_focused="true"
+        android:drawable="@color/setup_text_action" />
+    <item
+        android:state_pressed="true"
+        android:drawable="@color/setup_text_action" />
+    <item
+        android:drawable="@color/setup_step_background" />
+</selector>
diff --git a/java/res/drawable/setup_step_action_color.xml b/java/res/drawable/setup_step_action_color.xml
new file mode 100644
index 0000000000..c53e026d50
--- /dev/null
+++ b/java/res/drawable/setup_step_action_color.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2013, 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_focused="true"
+        android:color="@color/setup_step_background" />
+    <item
+        android:state_pressed="true"
+        android:color="@color/setup_step_background" />
+    <item
+        android:color="@color/setup_text_action" />
+</selector>
diff --git a/java/res/layout/setup_step.xml b/java/res/layout/setup_step.xml
index 26d7fe7995..c15d07bad8 100644
--- a/java/res/layout/setup_step.xml
+++ b/java/res/layout/setup_step.xml
@@ -42,7 +42,7 @@
     <View
         android:layout_width="match_parent"
         android:layout_height="2dp" />
-    <TextView
+    <Button
         android:id="@+id/setup_step_action_label"
         style="@style/setupStepActionLabelStyle"
         android:gravity="center_vertical"
diff --git a/java/res/values/setup-styles.xml b/java/res/values/setup-styles.xml
index cfc689a78e..420adcbb74 100644
--- a/java/res/values/setup-styles.xml
+++ b/java/res/values/setup-styles.xml
@@ -38,8 +38,8 @@
         <item name="android:textSize">14sp</item>
     </style>
     <style name="setupStepActionLabelStyle">
-        <item name="android:background">@color/setup_step_background</item>
-        <item name="android:textColor">@color/setup_text_action</item>
+        <item name="android:background">@drawable/setup_step_action_background</item>
+        <item name="android:textColor">@drawable/setup_step_action_color</item>
         <item name="android:textSize">18sp</item>
     </style>
 </resources>
diff --git a/java/src/com/android/inputmethod/latin/setup/SetupActivity.java b/java/src/com/android/inputmethod/latin/setup/SetupActivity.java
index 2ecd260abe..099169aa93 100644
--- a/java/src/com/android/inputmethod/latin/setup/SetupActivity.java
+++ b/java/src/com/android/inputmethod/latin/setup/SetupActivity.java
@@ -20,7 +20,6 @@ import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.Resources;
-import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.os.Message;
@@ -119,7 +118,7 @@ public final class SetupActivity extends Activity {
 
         final SetupStep step1 = new SetupStep(findViewById(R.id.setup_step1),
                 appName, R.string.setup_step1_title, R.string.setup_step1_instruction,
-                R.drawable.ic_settings_language, R.string.setup_step1_action);
+                R.drawable.ic_setup_step1, R.string.setup_step1_action);
         step1.setAction(new Runnable() {
             @Override
             public void run() {
@@ -131,7 +130,7 @@ public final class SetupActivity extends Activity {
 
         final SetupStep step2 = new SetupStep(findViewById(R.id.setup_step2),
                 appName, R.string.setup_step2_title, R.string.setup_step2_instruction,
-                0 /* actionIcon */, R.string.setup_step2_action);
+                R.drawable.ic_setup_step2, R.string.setup_step2_action);
         step2.setAction(new Runnable() {
             @Override
             public void run() {
@@ -144,7 +143,7 @@ public final class SetupActivity extends Activity {
 
         final SetupStep step3 = new SetupStep(findViewById(R.id.setup_step3),
                 appName, R.string.setup_step3_title, R.string.setup_step3_instruction,
-                R.drawable.sym_keyboard_language_switch, R.string.setup_step3_action);
+                R.drawable.ic_setup_step3, R.string.setup_step3_action);
         step3.setAction(new Runnable() {
             @Override
             public void run() {
@@ -314,9 +313,7 @@ public final class SetupActivity extends Activity {
                 final int paddingEnd = ViewCompatUtils.getPaddingEnd(mActionLabel);
                 ViewCompatUtils.setPaddingRelative(mActionLabel, paddingEnd, 0, paddingEnd, 0);
             } else {
-                final int overrideColor = res.getColor(R.color.setup_text_action);
                 final Drawable icon = res.getDrawable(actionIcon);
-                icon.setColorFilter(overrideColor, PorterDuff.Mode.MULTIPLY);
                 icon.setBounds(0, 0, icon.getIntrinsicWidth(), icon.getIntrinsicHeight());
                 TextViewCompatUtils.setCompoundDrawablesRelative(
                         mActionLabel, icon, null, null, null);
-- 
GitLab