diff options
| author |   Dan Zivkovic <zivkovic@google.com> | 2015-06-23 20:55:22 +0000 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2015-06-23 20:55:23 +0000 |
| commit | ecea6a6113964907bbcbe5912e7b1fcd855db605 (patch) | |
| tree | 6491f717c0b065d6a869c88840403ebc4ff0378d | |
| parent | f470729df26c67f48bd55bbf16a3d6066eac2a2f (diff) | |
| parent | 79e7cb75010a584da2679c08e9e655c4cd4ba763 (diff) | |
| download | latinime-ecea6a6113964907bbcbe5912e7b1fcd855db605.tar.gz latinime-ecea6a6113964907bbcbe5912e7b1fcd855db605.tar.xz latinime-ecea6a6113964907bbcbe5912e7b1fcd855db605.zip | |
Merge changes Iaed8abfb,I8e55b57c into jb-ub-latinimegoogle
* changes:
LatinIME portion of StatsUtil change.
Do not decorate committed spans.
| -rw-r--r-- | java-overridable/src/com/android/inputmethod/latin/utils/StatsUtils.java | 3 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java | 7 |
2 files changed, 7 insertions, 3 deletions
diff --git a/java-overridable/src/com/android/inputmethod/latin/utils/StatsUtils.java b/java-overridable/src/com/android/inputmethod/latin/utils/StatsUtils.java index 678597792..03e58478b 100644 --- a/java-overridable/src/com/android/inputmethod/latin/utils/StatsUtils.java +++ b/java-overridable/src/com/android/inputmethod/latin/utils/StatsUtils.java @@ -104,4 +104,7 @@ public final class StatsUtils { public static void onInputConnectionLaggy(final int operation, final long duration) { } + + public static void onDecoderLaggy(final int operation, final long duration) { + } } diff --git a/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java b/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java index 03c4ec62f..1dd5850f8 100644 --- a/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java +++ b/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java @@ -2158,9 +2158,10 @@ public final class InputLogic { final SuggestedWords suggestedWords = mSuggestedWords; // TODO: Locale should be determined based on context and the text given. final Locale locale = getDictionaryFacilitatorLocale(); - final CharSequence chosenWordWithSuggestions = - SuggestionSpanUtils.getTextWithSuggestionSpan(mLatinIME, chosenWord, - suggestedWords, locale); + final CharSequence chosenWordWithSuggestions = chosenWord; + // b/21926256 + // SuggestionSpanUtils.getTextWithSuggestionSpan(mLatinIME, chosenWord, + // suggestedWords, locale); if (DebugFlags.DEBUG_ENABLED) { long runTimeMillis = System.currentTimeMillis() - startTimeMillis; Log.d(TAG, "commitChosenWord() : " + runTimeMillis + " ms to run " |