From 12939572f3abd7847b5e604f8c5f041d60e1c823 Mon Sep 17 00:00:00 2001 From: "Tadashi G. Takaoka" Date: Fri, 7 Dec 2012 17:47:09 -0800 Subject: [PATCH] Remove unused suggestion preview stuffs Change-Id: Ida5668f4eba1783d96e02001a64ae713f98176b7 --- .../suggestion_feedback_background.9.png | Bin 1607 -> 0 bytes .../suggestion_feedback_background.9.png | Bin 1182 -> 0 bytes .../suggestion_feedback_background.9.png | Bin 1676 -> 0 bytes java/res/layout/suggestion_preview.xml | 28 ----------- java/res/values/attrs.xml | 1 - java/res/values/styles.xml | 3 -- java/res/values/themes-basic-highcontrast.xml | 1 - java/res/values/themes-basic.xml | 1 - java/res/values/themes-gingerbread.xml | 1 - java/res/values/themes-ics.xml | 1 - java/res/values/themes-stone-bold.xml | 1 - java/res/values/themes-stone.xml | 1 - .../suggestions/SuggestionStripView.java | 47 ------------------ 13 files changed, 85 deletions(-) delete mode 100644 java/res/drawable-hdpi/suggestion_feedback_background.9.png delete mode 100644 java/res/drawable-mdpi/suggestion_feedback_background.9.png delete mode 100644 java/res/drawable-xhdpi/suggestion_feedback_background.9.png delete mode 100644 java/res/layout/suggestion_preview.xml diff --git a/java/res/drawable-hdpi/suggestion_feedback_background.9.png b/java/res/drawable-hdpi/suggestion_feedback_background.9.png deleted file mode 100644 index 16499002e822c0ac4852673b57e2b90b67f11908..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1607 zcmV-N2Dtf&P)rhG&oWXS_y@n*8 zR-6}>9GldjmGWgbd#5qU({{-QCC97ePXpJJw)d%$W7578h$@at9S?+kfumh^ok<{d z*o;kfoKg;X>6!(2DhViidUd=ZAUCevmgMW)+l1r+u68Q4>v&ZGb>oI)fbjP1+aCZd zEiK(@Hk&sA!Z7?a2!dtT4bK`%slU=R{RJRNlAi~I!A}5Bo;>-3e55Ng7>>55l7upk zF)0vYcnQz|xO?~R{V0mQnyQAU#BezL{=tI>_p+bI6un2cZHkTI8e(1a85;v=+_`h- zK0veC{4xke;wvjFX{Xak0ov_$+G@4VC5w&YIOzBLAwaL!3pY16Ll|YRNs{~k@bKZo zdyI?&CynHcJ)TMe$~?xTPlGJySzB9cx7+P)fFKB1U0po}=ytmaZWo<43OYZ1`m_n~ z?Af!1eh=*T`yX#?Z1gjkA-VTRv~nhRE-E#$jVo8K+|q(8D=TTY+dayDnl5_YFN0&l zbh}*zFc=KxU%q@9!dU0;4Bbrn1V(!dPbC4iVFGK@bkbCc=H}*ZYT-_&bIiz7^!B!< z4)lG;x@5Wmkm(#{TZ6n`c7MmvRB{d5c8qBPL{apK7HGHIL#n3>&Kr7U98%P|X&l!^ z3n}Wa?T~sZ39y5&oyUxG7cCnE!TVac)oPh}z(s+Av2MUvXWiE!dB2V+_P5rk%8HO1aT+<^3RK*yRR{s~nnDmk6iaeDhl+F3tZ`ZSK zL|0$LS;VRsr?7_wSMW94uAF98;mTda$$8hilEk~S_?-JTQKw(y_N;rs z)DSUBon1Lftspf+sLWkVc#jd_4I@B&yL{K-Jw|{xi~w&K0p2hIykP`*!wB$(5#S9Y zz#B$D+0F_q<=CHrRub^0Zinz<^j6?x@Rnx^UBS|E<&3;P0U z>Xzx88k=jii!U6i1D9cxu%$qHaB%Re7Tn$4y|7;=P2Dn`UEU(ClM1TV0HyZ!`t|EA zEzs-rA}-#vX8;75ZUAIDpXdvIRGJ)i9#gh>;TT|NXXnN8^77XJTU%Sv($dlbz}ni{ zztdN@8XFrM3oz16@7vkgc|oy+wKAtED+bb3g1qRD?d|P9Z``=?7~t~d%U?Wy{(KH# zFc^fLPA37ldiCnitZ14h;y4a>cXuOzUa!~G22o0}x3~9L>x{cHTufX&l?2$|SIkeb z5ipmv=YWN*eF<0uSYKcNrqybFehzw0j5v;eeDvtix7p8qKvVqy&_&xvjB4`0suH&i zV^%fjx>y()WT83aZ~In3IJ(b}x%XTmr`Q5T zuWB0SO7(AbaAIW4{w7&Fq38_wC}Yz{%6y&hR1)9{z9w90 zy%eC$#S2oszWE?dvmo81fayK1plr7%T18t$C0il;Vy04M#+b%R{VF4+*8Zvm=>>Qy z3Gn~hLGYR?<)n^C9hHh1Ph$`pQfKOPy6jvhJe34Y^7LG?Wu8zae;T-+u)VL!BWisg zJBvx|Nw0AhRGNl-0iH?%0;LrCKYE-4-t;r?xhSfX;y;9ZQNtt~shj`+002ovPDHLk FV1kJ8{|^8F diff --git a/java/res/drawable-mdpi/suggestion_feedback_background.9.png b/java/res/drawable-mdpi/suggestion_feedback_background.9.png deleted file mode 100644 index 2a80f096d200d5ae8a7700d7b7399be4f7743d8a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1182 zcmV;P1Y!G$P)!g4&nzO(G#5f2*!`V2~L{u0l!hssErY1s2t?ld9 zow{45+u7Gb|2#<8WYSG{yYrjb+4pv5%j)&IH;BR*YYeQ$XWoDc!|+OB$Nm>-S7S@U zC{FyYlLzaO@D6ZB)LDo2Zc4pFy&eVLWQGa>&WKOD&K&)^1;?LQJfhxaM1z}vcR_-1 z>odxbPT;mk>(gbF6W#{LuzY!W`TqF$_)-uAbDZ-h>UZ~gU35zSPbuZ+YPI^QSS)_n z+1dH74WNu^8sLJ*;70tlwY7C2#7l3$B@Dy28yg$1RJDeTuxFzUo&xtlR##WomA79& zzuDPYnNFu=DwUFBV`Du(XHQN}SfNnh`Fx%q92{`qQM2%Fb92)eP@@cR!DDc-xVWe| zQ#t4}KR;hvSXihMQ`ytw+UVWg-3|8k_IzMc20hATG6k3n$^huYT>}}fPfScKK?8VP zfmifkAsVz-X^scugC5YQ_4-=4^-yROPJm;0kw_%wpizYiR@m>?a@~xr^>|vZAmEz@ z2;%XE!zNIR^f7#?LMPPIHpn8i9-}wVI%}Fqp1-J>ba~!Pmr$MVLZe!oasVE0n*puI z(|QGBY4bc4^DPVZ0{f4Ch7gVnA2B&&o?NhAyya3078?*ZJa=qEJnnez;Kv|j1Tm{DQVmOm_) z%U_`3`1p7z2NR=5>y@t1ft`UX=9_7@v$L}-e3{SZ#Sk`XOzZKqUOV0AT(DHuwsv%M z^bs1f*{sN9G9!Z|hw(uV)V1DPl=p=rY)r1CmdoXS%*@PekB*K$-{0R)6pKZkPN%Dr zlarxIQ}h_)T!o5I9uEK<(s-w*r`w>{Yt2=*J#kE~5}%yFpoA9i^lc@{m6es(3ijC$ z7VP`2t*tkzT2k@{!e2>6i%EP*NLFHahTx3>x3n}2n4X?aO-)TbRYp8aCX)|@5O;co z4a4wvsZ{!=pua+>93CDP5cpp$I7ce~uh(;U`=l;(sx7b#7|~+BGkxs*O4M^(qHw5c zF_2{~7~J#;@dBn&+;+AMhY+5L1Oe`Q?&}@<9a19A^-pY07*qoM6N<$f{XA!Jpcdz diff --git a/java/res/drawable-xhdpi/suggestion_feedback_background.9.png b/java/res/drawable-xhdpi/suggestion_feedback_background.9.png deleted file mode 100644 index 0ec90e5ead1559a038447d05b246e5897f757db9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1676 zcmV;726Op|P)aAJB3jk=g@C#G#D>mZ*A&5m#g+ zTvZ{|&Mt@U*zrpyGiy6zyMCWkJ?(a8z4P+zcy_%zOP=S<5xMv`SLAt4bV}PEce}3o zndf$5&vN7b@x1H%?vOGeMm5n^PpSm+yw3YMyyd$XLfpM8s)>so`$MUG=`%>0q6Enwh*(2fzYItDEjy7Bd#{f5O+;|UQ zb#?VRK&4W-0uaaX#{f|jt&O$U6C%&^zW}l<`vsue?fwkVZnu8~c=+()A4SnjMAs33 zWmydmjmvPG*)lEx+`fJL4nUG5pHFZfr$(>W`wrml-Me2Ds}71Njd%6+ebn&4_>Mx3 zHQK~mw{G15s8lMS0YuU3YL_ox&H(E5dInId)iQuIO=sf5Q>W9309vh94A5*gV}Pem zpT_X|ViQ2O+x;Hk-o1O$ber*3)79|6_>M-T*$KeL#zqaGR;%s6!0c<+t{nh08jWsI z-t}!hEskyP*49=9;L)Q;OE56K)oOhRu(`R}D$4hY=xe$f9va)V6r1ToefPO@=dK^F zWcutzqw%U(CI9lXVzy+cosC8#2WYq3X8@i&c@o1=d%r27t*?&6avwE3Fw$_>C}pS* zUtV6ma=3E6UYFnA2h0b?#G(B)?JP^y_Lh|7#ta~SZ^@-&D8L~`1avTA|?P)6uo=6a+;>IJ{s{Q zhoSZWL+v$rGe>~Qi!ojM@L9n%4nOfs^BCscY>BNsru`-#GEdfDs?_knjCH2Dz{ot< zezQG-8Xg$mQHssRrcbcxVz{UlFsNIhOtwUJypkiy9sn zO?Y55;emSWi>oBuBXvXoZoMMfB#p2YPEV5V0U+S31EGF-8{cI*O>Mg zOndR4&rlMn;eqiThaWqO*~^zNw_#v-v)N1l*4NixiTd+K1cUY%OnY(9>Sjd^4~%V; z;+mWF0O0xa=RX0gt*w0tu)V#V0IaUAt^jOoZ2UXn+nFZP*^bl$>Q z!*`S-=LI!Tj;!|qJ{^?^$d?W0+vNwDdJm2tODG;dGjlP zG)+I5_?}LIPN(w&!2SF8zb;no714Y*?HBQth;nA6{t=*t2gdarW+I|7{EUc0reC~x zu?BGA!iB2%04- zGBrFfzGs@!6x+KX46?j5$!4~RW#4+@x{hy~F;p6A`eIujElu`4 z97o&w?9yf%)bPN#eziB)uI{-;HF9oN*G!gDfJwcJ&Gv>Vo9V8o@9~)zeEV>NG~Lz5 z`x+hkZG*nXyG+(TeAdzTX%0typXQr}uR$*JT!xl4c~Uc6xXdeStnc=$sNsPb)g)Uz zUsKDj9~YZ>zU#}@x1xpz=Cq6&ce|(6hlj3z1T{P`QJ&}h_h8Ndr**gOOf)dhbN&bM W9!np#ElR8a0000 - - - diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml index 27a5cadf2..3eb27e76b 100644 --- a/java/res/values/attrs.xml +++ b/java/res/values/attrs.xml @@ -32,7 +32,6 @@ - diff --git a/java/res/values/styles.xml b/java/res/values/styles.xml index a60e4496b..0bcf943e4 100644 --- a/java/res/values/styles.xml +++ b/java/res/values/styles.xml @@ -162,9 +162,6 @@ - diff --git a/java/res/values/themes-basic.xml b/java/res/values/themes-basic.xml index ff6a70a08..88a0c5d8d 100644 --- a/java/res/values/themes-basic.xml +++ b/java/res/values/themes-basic.xml @@ -26,6 +26,5 @@ @style/SuggestionStripViewStyle @style/MoreSuggestionsViewStyle @style/SuggestionBackgroundStyle - @style/SuggestionPreviewBackgroundStyle diff --git a/java/res/values/themes-gingerbread.xml b/java/res/values/themes-gingerbread.xml index 0ce0b8a9b..51f680a7a 100644 --- a/java/res/values/themes-gingerbread.xml +++ b/java/res/values/themes-gingerbread.xml @@ -26,6 +26,5 @@ @style/SuggestionStripViewStyle @style/MoreSuggestionsViewStyle @style/SuggestionBackgroundStyle - @style/SuggestionPreviewBackgroundStyle diff --git a/java/res/values/themes-ics.xml b/java/res/values/themes-ics.xml index 8df58c594..d9c59a180 100644 --- a/java/res/values/themes-ics.xml +++ b/java/res/values/themes-ics.xml @@ -26,6 +26,5 @@ @style/SuggestionStripViewStyle.IceCreamSandwich @style/MoreSuggestionsViewStyle.IceCreamSandwich @style/SuggestionBackgroundStyle.IceCreamSandwich - @style/SuggestionPreviewBackgroundStyle.IceCreamSandwich diff --git a/java/res/values/themes-stone-bold.xml b/java/res/values/themes-stone-bold.xml index 355a97f7b..6ace9d673 100644 --- a/java/res/values/themes-stone-bold.xml +++ b/java/res/values/themes-stone-bold.xml @@ -26,6 +26,5 @@ @style/SuggestionStripViewStyle @style/MoreSuggestionsViewStyle @style/SuggestionBackgroundStyle - @style/SuggestionPreviewBackgroundStyle diff --git a/java/res/values/themes-stone.xml b/java/res/values/themes-stone.xml index 23437f780..3c3826b1a 100644 --- a/java/res/values/themes-stone.xml +++ b/java/res/values/themes-stone.xml @@ -26,6 +26,5 @@ @style/SuggestionStripViewStyle @style/MoreSuggestionsViewStyle @style/SuggestionBackgroundStyle - @style/SuggestionPreviewBackgroundStyle diff --git a/java/src/com/android/inputmethod/latin/suggestions/SuggestionStripView.java b/java/src/com/android/inputmethod/latin/suggestions/SuggestionStripView.java index 9fc2bf987..e27fc2a7a 100644 --- a/java/src/com/android/inputmethod/latin/suggestions/SuggestionStripView.java +++ b/java/src/com/android/inputmethod/latin/suggestions/SuggestionStripView.java @@ -28,7 +28,6 @@ import android.graphics.Rect; import android.graphics.Typeface; import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; -import android.os.Message; import android.text.Spannable; import android.text.SpannableString; import android.text.Spanned; @@ -47,7 +46,6 @@ import android.view.View.OnClickListener; import android.view.View.OnLongClickListener; import android.view.ViewGroup; import android.widget.LinearLayout; -import android.widget.PopupWindow; import android.widget.RelativeLayout; import android.widget.TextView; @@ -64,7 +62,6 @@ import com.android.inputmethod.latin.Constants; import com.android.inputmethod.latin.LatinImeLogger; import com.android.inputmethod.latin.R; import com.android.inputmethod.latin.ResourceUtils; -import com.android.inputmethod.latin.StaticInnerHandlerWrapper; import com.android.inputmethod.latin.SuggestedWords; import com.android.inputmethod.latin.Utils; import com.android.inputmethod.latin.define.ProductionFlag; @@ -95,43 +92,12 @@ public final class SuggestionStripView extends RelativeLayout implements OnClick private final ArrayList mInfos = CollectionUtils.newArrayList(); private final ArrayList mDividers = CollectionUtils.newArrayList(); - private final PopupWindow mPreviewPopup; - private final TextView mPreviewText; - Listener mListener; SuggestedWords mSuggestedWords = SuggestedWords.EMPTY; private final SuggestionStripViewParams mParams; private static final float MIN_TEXT_XSCALE = 0.70f; - private final UiHandler mHandler = new UiHandler(this); - - private static final class UiHandler extends StaticInnerHandlerWrapper { - private static final int MSG_HIDE_PREVIEW = 0; - - public UiHandler(final SuggestionStripView outerInstance) { - super(outerInstance); - } - - @Override - public void dispatchMessage(final Message msg) { - final SuggestionStripView suggestionStripView = getOuterInstance(); - switch (msg.what) { - case MSG_HIDE_PREVIEW: - suggestionStripView.hidePreview(); - break; - } - } - - public void cancelHidePreview() { - removeMessages(MSG_HIDE_PREVIEW); - } - - public void cancelAllMessages() { - cancelHidePreview(); - } - } - private static final class SuggestionStripViewParams { private static final int DEFAULT_SUGGESTIONS_COUNT_IN_STRIP = 3; private static final float DEFAULT_CENTER_SUGGESTION_PERCENTILE = 0.40f; @@ -610,13 +576,6 @@ public final class SuggestionStripView extends RelativeLayout implements OnClick final LayoutInflater inflater = LayoutInflater.from(context); inflater.inflate(R.layout.suggestions_strip, this); - mPreviewPopup = new PopupWindow(context); - mPreviewText = (TextView) inflater.inflate(R.layout.suggestion_preview, null); - mPreviewPopup.setWindowLayoutMode( - ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT); - mPreviewPopup.setContentView(mPreviewText); - mPreviewPopup.setBackgroundDrawable(null); - mSuggestionsStrip = (ViewGroup)findViewById(R.id.suggestions_strip); for (int pos = 0; pos < MAX_SUGGESTIONS; pos++) { final TextView word = (TextView)inflater.inflate(R.layout.suggestion_word, null); @@ -697,10 +656,6 @@ public final class SuggestionStripView extends RelativeLayout implements OnClick dismissMoreSuggestions(); } - void hidePreview() { - mPreviewPopup.dismiss(); - } - private final KeyboardActionListener mMoreSuggestionsListener = new KeyboardActionListener.Adapter() { @Override @@ -863,8 +818,6 @@ public final class SuggestionStripView extends RelativeLayout implements OnClick @Override protected void onDetachedFromWindow() { super.onDetachedFromWindow(); - mHandler.cancelAllMessages(); - hidePreview(); dismissMoreSuggestions(); } }