From 25425d0c98914bc805cc12fb82a978223c451eea Mon Sep 17 00:00:00 2001 From: =?utf8?q?Reimar=20D=C3=B6ffinger?= Date: Fri, 28 Oct 2016 00:43:52 +0200 Subject: [PATCH] Also add a search/clear FloatingActionButton. --- res/drawable-hdpi/ic_clear_black_24dp.png | Bin 0 -> 207 bytes res/drawable-hdpi/ic_search_black_24dp.png | Bin 0 -> 390 bytes res/drawable-mdpi/ic_clear_black_24dp.png | Bin 0 -> 164 bytes res/drawable-mdpi/ic_search_black_24dp.png | Bin 0 -> 249 bytes res/drawable-xhdpi/ic_clear_black_24dp.png | Bin 0 -> 235 bytes res/drawable-xhdpi/ic_search_black_24dp.png | Bin 0 -> 464 bytes res/drawable-xxhdpi/ic_clear_black_24dp.png | Bin 0 -> 309 bytes res/drawable-xxhdpi/ic_search_black_24dp.png | Bin 0 -> 684 bytes res/drawable-xxxhdpi/ic_clear_black_24dp.png | Bin 0 -> 377 bytes res/drawable-xxxhdpi/ic_search_black_24dp.png | Bin 0 -> 868 bytes res/layout/dictionary_activity.xml | 8 ++++++++ .../android/dictionary/DictionaryActivity.java | 17 +++++++++++++++++ 12 files changed, 25 insertions(+) create mode 100644 res/drawable-hdpi/ic_clear_black_24dp.png create mode 100644 res/drawable-hdpi/ic_search_black_24dp.png create mode 100644 res/drawable-mdpi/ic_clear_black_24dp.png create mode 100644 res/drawable-mdpi/ic_search_black_24dp.png create mode 100644 res/drawable-xhdpi/ic_clear_black_24dp.png create mode 100644 res/drawable-xhdpi/ic_search_black_24dp.png create mode 100644 res/drawable-xxhdpi/ic_clear_black_24dp.png create mode 100644 res/drawable-xxhdpi/ic_search_black_24dp.png create mode 100644 res/drawable-xxxhdpi/ic_clear_black_24dp.png create mode 100644 res/drawable-xxxhdpi/ic_search_black_24dp.png diff --git a/res/drawable-hdpi/ic_clear_black_24dp.png b/res/drawable-hdpi/ic_clear_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..1a9cd75a0d2692fa380f367bdb41c2420df310b0 GIT binary patch literal 207 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8LpG*1`DkP61PSG>8J9RwIIzPh7b zJflYMsk(bE^P@Beu4=(eGmA7oyR_x~a$D?{a5p37g|Cs|p&E~Q4@@WZu3cW0RzKfl zOG4W1`7gJ literal 0 HcmV?d00001 diff --git a/res/drawable-hdpi/ic_search_black_24dp.png b/res/drawable-hdpi/ic_search_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..c593e7ad854f5c28ca21f59916bef001daf91141 GIT binary patch literal 390 zcmV;10eSw3P)Ie}b{Y0>&5zCE?P(?24DspFz~M>13AquYhXVmc9#mjToN#t{kJbFs zAFr$!5in(|H)mQ{)7S7t1yqg>d$~PPv)ql={NblEkt88jLVZn=Iu}Ws7?rrmZYm_3 zNYNOhwhXRF<4L~8Xefgt(iC;!M!pONq;Vv_V$_qtDQT*b?=fn~;FcW8x{@z3ayZCn zCneoT+Q&kmk1uoYQ?er;Sop9Soc)d=rOjtt1__rksknv7X<;>w;SeO>WVtLC_5Qg~gJ%R;MW*{kNSulk$4YNk~_ kWUtZ}Wv}va`9I#i0Rr;B7AuwXp#T5?07*qoM6N<$f}W+V0ssI2 literal 0 HcmV?d00001 diff --git a/res/drawable-mdpi/ic_clear_black_24dp.png b/res/drawable-mdpi/ic_clear_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..40a1a84e34f4fb9c31b1dccf1b2bd7f5a50ac00d GIT binary patch literal 164 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+iY)==*kP619lQs%6EAp^x=L~Fl z``+Hk)n=Dm!pL5PtJwWQDwD%^7mKX72vfc*YT)xac;A{}-v*=ps zr9JO5s)Jrvt$1~wJ<6?Hv?}9?*Yy)i*G<&jSt@L~vF4xM{qD^_8RvC6y^4F&G81Sm NgQu&X%Q~loCIAp8KMVi> literal 0 HcmV?d00001 diff --git a/res/drawable-mdpi/ic_search_black_24dp.png b/res/drawable-mdpi/ic_search_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..6b16343235c2729720113158598c891fd041949f GIT binary patch literal 249 zcmV|r4fyyw@M>+ir$LGPVo;#@wk2g)LvA~nWu7_00000NkvXXu0mjfU?OPG literal 0 HcmV?d00001 diff --git a/res/drawable-xhdpi/ic_clear_black_24dp.png b/res/drawable-xhdpi/ic_clear_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..6bc437298ab7bfbfbf128acdf5849e304b3c6903 GIT binary patch literal 235 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0DO`a}}Ar*{or)}gqq9DL3|6^j{ z=hBm&C)~N@b{5Sp4w$_m*}geiNBekToKL{TWpQP5xqRwZuPjq53pI^Z3A|FbUaRcY z{O^J0fmhZ3y?R?;$@JP$iP2W!Cd>8DEZ3V|*s2`1aV~kzx#D@}&nn~61{Xzi+b(jKntiPo%%5fP`-@uPgu|~7wTA~r iR9eY#70Eo`TEl2=&Qt5V_=GOd^$eb_elF{r5}E*W0WbcEP)qmm|Br0Z<*XWN7ITU>j{~Prc+$enwQKUMGw$gnG_yC$`NCG*{ z;&A9} zBR>#FFVw<+y*-{8S8UK=fkm2Za{c>?(6_M5;U|5JT4so77h#`Pw6By&Q{mob*6{Y- zetnrN6?=;(JoW7E`{Y?cv<_a*^w*PCL5Y$sxIi+SaZVl4jtI2I6Oz)Sep;~(3D)6+JKh*G<(-599TWq^Iv|SU_$!VO zYo90%5o?bq4iIZM{)!!<*pI(rFZKf1jre%AGp|tiAN>M}3sYaXitA1LhEy=VysgJ$~x+g}6OvsxLimbaeN-!xQItoH=3nd`|H@dF!kYp_dChV`b9AudQLRn7yg2 zv~UiON9*MGOYAy6D=_*g@;c3(5`S(Hi^X;wk8Ms*3SMP^!WTf z-E_DAd$kLMWY`Z`);MuKF9=d$?_mzLoFj7Xp~|_3ODg!(3;AT&wLoS^O+0tsvcZJ& zD(m_$dNm(!9@n+CTyDa$w$*a^-$!>qK3P{4end8+qbAwoFEAV!JYD@<);T3K0RXh> Be)#|Z literal 0 HcmV?d00001 diff --git a/res/drawable-xxhdpi/ic_search_black_24dp.png b/res/drawable-xxhdpi/ic_search_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..3ae490ef9be0c727cdea0ff907723362d0ccf021 GIT binary patch literal 684 zcmV;d0#p5oP)u)P;0e zzc7B_qFO`{h4JmKoWoR{mmZD6{LcD0JY?p5NBJL#L?V%BqRbR)9C1a+6;;-lq(mb% z(8UV3xPQ(q%XIRDKJXp);C!W>C-902F6P`ZO~9in@B`;H+vIsP?>NSJPn9B%qCm9H zFDjHMQcsF{ij|zSrmYXUK0U)c zY=k?NX~U4dcZP{)M5Q({(}jLm@#zQGfsqyUDrboA4W}Zzh>0fk&FaU`pvd0PfPu2Q zchdL?xDfen3`~iI75vSL`~(Kp#KIE(dPRN}14m+E5r3^Be~5uAv9KP08IixlKqwZb z@Rt(#@HzZKS&_fSK-K;ovO8sE{Pl_aItC`i!WsO{iTpSQN@C%;|4q$rk?+AkqxzN& z;AcpE%W{}l7E4da5?_upkzK+_Cr->4;#*M3kC^$U7LO3ms7h^Ms9pbk9IMi(%7nbf z)F+&pd9vIu#{y2x7{&s&acWK(Bp@nah%=m;Ez+3FQ^o1wf?0ZLB}0lVt@JS`?j8Ai z)?tsLuH-!j6fl-&+q1-$`d4V*zEZ$6cQMO^jFF}eCuWZV=GxedQD@`tL3g?mdF;`_ zA~*L`xnW7&$_GzV2^#2Tf>jQ=B;=Yy))}XV9NJssN(Kt-g~}cLi3NSnFL zkGQYSP&@m;*IK6Q-#O#%t5^JG`{BMqf8+n2Z|={&zE4otx%%IU37m2NTYWzKGCBDA zGRyk&LVN6HtbDhUpKVe#i0?1F$Iko1uY_g0mfJ~qyju(6`+^n!Z*4iz5hh+Bv?p(-%zt$M-+!?Iw6Q#P16<$f#A@_7oVT44$rjF6*2U FngA8*uUr5C literal 0 HcmV?d00001 diff --git a/res/drawable-xxxhdpi/ic_search_black_24dp.png b/res/drawable-xxxhdpi/ic_search_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..21be572990b53d8e0e518c620a3257f19bd1864b GIT binary patch literal 868 zcmV-q1DpJbP)4TXzm;VPvvcwr7M2HdMWZC4h%@*Fpv8egxp~((Y zn87r=G|e{>5gdAh-w;FJGSD0$G5Oixek~W>XQ5xN!S4pCKbV8L+nBxeu;pFk6jHt%3Y88F% zkKsiO{ajeVD*f-u4qol4iPu;ZLsV0El|fVytjVjTe#Z}0H8qDdTWYBye%Mx1H?ZbV zEtSO&i)v~aYxFNWjvtb0>Lu3H)KVk(VN^}M$C?+lR0uzW)zs(LzJcazzl9!N`yX)? zYYwa&qf2V)k-G=kCVnWXsU@t*TR5?Y_|x61L=;g?{^-!3=vJ*u05xx2ZQT>2*^N6ZJl3t{FLR7OjaEhpIiPEhY z_s)L)N{SYux+6t5(uT`#lE9I51l=RKF7Ev&1l`v-Gt32Is7$PbgYytE^fMtGicm)k zHQ6K6=Bc|+3o%sVO&rV6KrmNjn?;h05+=+jNtP(-cOJFz4{>gm2I6~P;!uV<;<38^ zbd)b}D8f17pHGKF6sf6{O34BFX=x|671Lj*$-gQGJyp z#y-QjaaOoS+H^&M3AC>eW1rF&5prx$=8}7!Y4SjoBTE0ZKj&5u15pSB2}c3`IrmCk zN&tU*9%W+D&w9!E`2-4=u!ZsECwxr8;wMaDyw6P-!g%o$wn^yxgeHu2ZbAuT@)HI+ uz$BDlI`Y0rC_y#QeWU*Wendn>M8plT<4%HsxPR9G0000 + + 0) { + searchView.setQuery("", false); + } + showKeyboard(); + searchView.setIconified(false); + } + }); + // Set the search text from the intent, then the saved state. String text = getIntent().getStringExtra(C.SEARCH_TOKEN); if (savedInstanceState != null) { @@ -1666,6 +1682,7 @@ public class DictionaryActivity extends ActionBarActivity { } currentSearchOperation = new SearchOperation(text, index); searchExecutor.execute(currentSearchOperation); + ((FloatingActionButton)findViewById(R.id.floatSearchButton)).setImageResource(text.length() > 0 ? R.drawable.ic_clear_black_24dp : R.drawable.ic_search_black_24dp); } // -------------------------------------------------------------------------- -- 2.43.0