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 16499002e..000000000 Binary files a/java/res/drawable-hdpi/suggestion_feedback_background.9.png and /dev/null differ 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 2a80f096d..000000000 Binary files a/java/res/drawable-mdpi/suggestion_feedback_background.9.png and /dev/null differ 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 0ec90e5ea..000000000 Binary files a/java/res/drawable-xhdpi/suggestion_feedback_background.9.png and /dev/null differ diff --git a/java/res/layout/suggestion_preview.xml b/java/res/layout/suggestion_preview.xml deleted file mode 100644 index 856447bba..000000000 --- a/java/res/layout/suggestion_preview.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - 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(); } }