From ea9098ca69599905fdd5fd5eba55dc63d2073357 Mon Sep 17 00:00:00 2001 From: satok Date: Thu, 26 May 2011 14:10:00 +0900 Subject: [PATCH] Add SuggestionSpan suggestion picked notification receiver Bug: 4443922 Change-Id: I8a9dc5077ae06c6d0c39fd7fdd823fc4f4d05f45 --- java/AndroidManifest.xml | 6 +++ .../compat/SuggestionSpanUtils.java | 31 ++++++++----- ...gestionSpanPickedNotificationReceiver.java | 43 +++++++++++++++++++ 3 files changed, 69 insertions(+), 11 deletions(-) create mode 100644 java/src/com/android/inputmethod/latin/SuggestionSpanPickedNotificationReceiver.java diff --git a/java/AndroidManifest.xml b/java/AndroidManifest.xml index 2fbf4c2be..cb0a9a2e1 100644 --- a/java/AndroidManifest.xml +++ b/java/AndroidManifest.xml @@ -41,5 +41,11 @@ + + + + + + diff --git a/java/src/com/android/inputmethod/compat/SuggestionSpanUtils.java b/java/src/com/android/inputmethod/compat/SuggestionSpanUtils.java index b9ea9358d..5b02de36e 100644 --- a/java/src/com/android/inputmethod/compat/SuggestionSpanUtils.java +++ b/java/src/com/android/inputmethod/compat/SuggestionSpanUtils.java @@ -17,6 +17,7 @@ package com.android.inputmethod.compat; import com.android.inputmethod.latin.SuggestedWords; +import com.android.inputmethod.latin.SuggestionSpanPickedNotificationReceiver; import android.content.Context; import android.text.Spannable; @@ -24,23 +25,29 @@ import android.text.SpannableString; import android.text.Spanned; import java.lang.reflect.Constructor; +import java.util.Locale; public class SuggestionSpanUtils { - private static final Class CLASS_SuggestionSpan = - CompatUtils.getClass("android.text.style.SuggestionSpan"); + public static final String ACTION_SUGGESTION_PICKED = + "android.text.style.SUGGESTION_PICKED"; + public static final String SUGGESTION_SPAN_PICKED_AFTER = "after"; + public static final String SUGGESTION_SPAN_PICKED_BEFORE = "before"; + public static final String SUGGESTION_SPAN_PICKED_HASHCODE = "hashcode"; + + private static final Class CLASS_SuggestionSpan = CompatUtils + .getClass("android.text.style.SuggestionSpan"); private static final Class[] INPUT_TYPE_SuggestionSpan = new Class[] { - Context.class, String[].class, int.class - }; - private static final Constructor CONSTRUCTOR_SuggestionSpan = - CompatUtils.getConstructor(CLASS_SuggestionSpan, INPUT_TYPE_SuggestionSpan); + Context.class, Locale.class, String[].class, int.class, Class.class }; + private static final Constructor CONSTRUCTOR_SuggestionSpan = CompatUtils + .getConstructor(CLASS_SuggestionSpan, INPUT_TYPE_SuggestionSpan); public static final boolean SUGGESTION_SPAN_IS_SUPPORTED; static { - SUGGESTION_SPAN_IS_SUPPORTED = CLASS_SuggestionSpan != null - && CONSTRUCTOR_SuggestionSpan != null; + SUGGESTION_SPAN_IS_SUPPORTED = + CLASS_SuggestionSpan != null && CONSTRUCTOR_SuggestionSpan != null; } - public static CharSequence getTextWithSuggestionSpan( - Context context, CharSequence suggestion, SuggestedWords suggestedWords) { + public static CharSequence getTextWithSuggestionSpan(Context context, + CharSequence suggestion, SuggestedWords suggestedWords) { if (CONSTRUCTOR_SuggestionSpan == null || suggestedWords == null || suggestedWords.size() == 0) { return suggestion; @@ -58,7 +65,9 @@ public class SuggestionSpanUtils { for (int i = 0; i < N; ++i) { suggestionsArray[i] = suggestedWords.getWord(i).toString(); } - final Object[] args = {context, suggestionsArray, 0}; + final Object[] args = + { context, null, suggestionsArray, 0, + (Class) SuggestionSpanPickedNotificationReceiver.class }; final Object ss = CompatUtils.newInstance(CONSTRUCTOR_SuggestionSpan, args); if (ss == null) { return suggestion; diff --git a/java/src/com/android/inputmethod/latin/SuggestionSpanPickedNotificationReceiver.java b/java/src/com/android/inputmethod/latin/SuggestionSpanPickedNotificationReceiver.java new file mode 100644 index 000000000..4a3f42d5d --- /dev/null +++ b/java/src/com/android/inputmethod/latin/SuggestionSpanPickedNotificationReceiver.java @@ -0,0 +1,43 @@ +/* + * Copyright (C) 2011 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. + */ + +package com.android.inputmethod.latin; + +import com.android.inputmethod.compat.SuggestionSpanUtils; + +import android.content.BroadcastReceiver; +import android.content.Context; +import android.content.Intent; +import android.util.Log; + +public class SuggestionSpanPickedNotificationReceiver extends BroadcastReceiver { + private static final boolean DBG = LatinImeLogger.sDBG; + private static final String TAG = + SuggestionSpanPickedNotificationReceiver.class.getSimpleName(); + + @Override + public void onReceive(Context context, Intent intent) { + if (SuggestionSpanUtils.ACTION_SUGGESTION_PICKED.equals(intent.getAction())) { + if (DBG) { + final String before = intent.getStringExtra( + SuggestionSpanUtils.SUGGESTION_SPAN_PICKED_BEFORE); + final String after = intent.getStringExtra( + SuggestionSpanUtils.SUGGESTION_SPAN_PICKED_AFTER); + Log.d(TAG, "Received notification picked: " + before + "," + after); + } + } + } +}