From 464202047d6813e7559ceb8e73aceae0b15da1d9 Mon Sep 17 00:00:00 2001 From: "Tadashi G. Takaoka" 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 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 HP6agWdsZG0( zE-IBv94eLMF0x&Ur-V|DGPUj6YAbD|*lQ}C^GDDAE-!q@u$DB1pkQt3)wkIbFrTeA1=EbB!5~ zL4SfMq8XUaK?QSs(QXnMgeK#NSUv#&&=d*|Adx8)U>zDH03er5t6*T@NI$0_l5#j-g~jqOg@Q|lSMj8H07t-!M4G%lq2&sH z=)Yln6D<#jmqK`dNG^$$@!|alUo}sLYxnn#G(b2Sx{pi@4AhE)e#lXN{ zZ~~!#?hcZPM2Z_306+qT3IJ3PWYR#8%yy(uK>`h!*Z3xvLL(6XCWYooWB~vhqyj85 z)e$5TNhBhPN+8d3J;ibbPt1qr{R%aHKXb`{%cZ-?Af7@Z3y?@+<~zVQQlgN^BPCL_ z+ZGCXEr-V!iZup1%?5qWmj%g$age}WCJ~`ORhTaPMg(ki)nxh*) zU{cv6f;$28g)8`fs)mPy!E4&%f7)f<1oxn3`nCDt#nuzS6{Q|yv(Dm7)N$iG$t#@qCXAs{#fOTwqcIuB8u4=RT1!N0nd8>c z-lXJV;Q@y{41ivM{RGo-fmHNMPFBsQX7ZXG;v$7J!aDAUGI zNP17`48+%($Y@Dv@BMZJS&Hi0ZUFD6jEjQaJg1d!qZAP>lVZE-JsvH4Y0+_{cGc`; ziqB|oNT%6Dnf0bO;SQ4C?}MeiCV6f7xMF&GpQ5^j%0_i6m40EQ} z7RfNjo?U2rt)pBYzT4iO;hKmmVeRX=eLtgf-RugeJlZr+Nm+}GFL25*xVbc38oDTc zn}bT*FyT>VGQb5Z8nl72(zqLY8*b+WdS%$ZMm78>_8T&w$g|6kK~(BVQOJL~Z>Q!2 z?wU$eF?8Z0|8ezRe3;$4!;&T&X-elynKbJl%UUjbSD2G*$932X{#veWPW)G-j>A;k z+mfo8+6rr8LLXjg%|F~YtD^cD^o<=D0So7};&v`CenQQuIi_2d=w&{N*zsa?;#ZsH zuaM>`rA^rfYWkB;IlaIy5#?NtA!LU-A8ROL*q*+i{HZ_tw39k#f-OZ}$+&Fcc&jvz zcERRh^AqXa;>oHCcb}?dHX;m>nBDuKtN+F-0bZFp(9#i5;5&JRR*1U3Vf4);)=qsW z%iF~ytiR$K)cY{cEV?`Ifs*wxVBs?C6fYX!R{sxBils%VhK zHtVQIc7vo6iyckDmRqfMFa4QSK*yrGdg`N!lvZYV6gkA>#WXtlu#}#YDqh*`zQ21W zs-01L&e97y+VMQ?TGsT$8J!z5*QbpV3t~@pF=BqmKUMpZ7ch3$m_9o9%jnsu@0^~E zDz0KX4^Lk?)%)I}zG+}<^``ur)x4@8=aW2I4MAy1)3fp|edK>JaP_Nw>UJGU?(|rQ zI{IR}UFJ=5yjY?5khpT0Wmu?cD4Ks97dJvFSvahy=ld8FwJIM3zrMW8v76yVGvQW^ zE0TA9Jk3tJ^s+jAEVcc}rj12OFm%tE#8Rq$9G!PJu}P$Nce6`+5$XVXcXQz;rqAWt z#pl+@qwJx=bnn#4Iv3VxjrODOZ6%fcCBmM!Laf~BMMXw>ZuueVsXu4F^Nr5S${1^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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 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`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=YKL?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!d7jrhR zad++4XFYOFIfoogBR`p^Tc~qpUwa|v@jocQchwq|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=``WSP1BLjXEa}Z*s90MrhVn#(TfT{SvsH34B8@cF^iLDTJTAaN5!Y(`n98s zGi|wfmI-rdf2>Se-!7{AZp%FuHfGM&sXsp0NV={L(Dl@dOcm2J&@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#5y5?s`L$UKe;<6D-vM`C5LXN(sD;=IS*xN+F}8 zw~&N5p@t306;Xv+FtIQ$Nm`gIrOMC|3{<#*1`8-bNP;pb^He&TfsTHyOM}PeWh@%? z8Up3g(Qlj*3pbsFj9> 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;`-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 z4plfeeS7d#{_T)54tOl}%Lqsji_=f34x14xdx1c-`$L83}<0n(9FvZc7aiodZ z-;-_1Yq#A$l{&1`j{5DY_x3B$9-8E&JS!T?+ y@o)UAb?R}Gt9#D`Kg_7)e^I?dve*BbH4;I2MyfP+ + + + + + + + diff --git a/java/res/drawable/ic_setup_step2.xml b/java/res/drawable/ic_setup_step2.xml new file mode 100644 index 000000000..46db29306 --- /dev/null +++ b/java/res/drawable/ic_setup_step2.xml @@ -0,0 +1,30 @@ + + + + + + + + diff --git a/java/res/drawable/ic_setup_step3.xml b/java/res/drawable/ic_setup_step3.xml new file mode 100644 index 000000000..4ff9fd933 --- /dev/null +++ b/java/res/drawable/ic_setup_step3.xml @@ -0,0 +1,30 @@ + + + + + + + + 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 000000000..8ac8a86d1 --- /dev/null +++ b/java/res/drawable/ic_setup_step3_finish.xml @@ -0,0 +1,30 @@ + + + + + + + + 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 000000000..25738e3a4 --- /dev/null +++ b/java/res/drawable/setup_step_action_background.xml @@ -0,0 +1,30 @@ + + + + + + + + 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 000000000..c53e026d5 --- /dev/null +++ b/java/res/drawable/setup_step_action_color.xml @@ -0,0 +1,30 @@ + + + + + + + + diff --git a/java/res/layout/setup_step.xml b/java/res/layout/setup_step.xml index 26d7fe799..c15d07bad 100644 --- a/java/res/layout/setup_step.xml +++ b/java/res/layout/setup_step.xml @@ -42,7 +42,7 @@ - 14sp diff --git a/java/src/com/android/inputmethod/latin/setup/SetupActivity.java b/java/src/com/android/inputmethod/latin/setup/SetupActivity.java index 2ecd260ab..099169aa9 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);