Merge "Make session id mandatory for getSuggestions." (d1f9ce00) · Commits · e / os / android_packages_inputmethods_LatinIME

java/src/com/android/inputmethod/latin/BinaryDictionary.java

+2 −15

Original line number	Diff line number	Diff line
		@@ -112,13 +112,10 @@ public final class BinaryDictionary extends Dictionary {
		private DicTraverseSession getTraverseSession(final int traverseSessionId) {
		synchronized(mDicTraverseSessions) {
		DicTraverseSession traverseSession = mDicTraverseSessions.get(traverseSessionId);
		if (traverseSession == null) {
		traverseSession = mDicTraverseSessions.get(traverseSessionId);
		if (traverseSession == null) {
		traverseSession = new DicTraverseSession(mLocale, mNativeDict, mDictSize);
		mDicTraverseSessions.put(traverseSessionId, traverseSession);
		}
		}
		return traverseSession;
		}
		}
		@@ -266,18 +263,8 @@ public final class BinaryDictionary extends Dictionary {
		new FormatSpec.FormatOptions(outFormatVersion[0], hasHistoricalInfo));
		}


		@Override
		public ArrayList<SuggestedWordInfo> getSuggestions(final WordComposer composer,
		final String prevWord, final ProximityInfo proximityInfo,
		final boolean blockOffensiveWords, final int[] additionalFeaturesOptions,
		final float[] inOutLanguageWeight) {
		return getSuggestionsWithSessionId(composer, prevWord, proximityInfo, blockOffensiveWords,
		additionalFeaturesOptions, 0 /* sessionId */, inOutLanguageWeight);
		}

		@Override
		public ArrayList<SuggestedWordInfo> getSuggestionsWithSessionId(final WordComposer composer,
		final String prevWord, final ProximityInfo proximityInfo,
		final boolean blockOffensiveWords, final int[] additionalFeaturesOptions,
		final int sessionId, final float[] inOutLanguageWeight) {

java/src/com/android/inputmethod/latin/Dictionary.java

+3 −12

Original line number	Diff line number	Diff line
		@@ -73,6 +73,7 @@ public abstract class Dictionary {
		* @param proximityInfo the object for key proximity. May be ignored by some implementations.
		* @param blockOffensiveWords whether to block potentially offensive words
		* @param additionalFeaturesOptions options about additional features used for the suggestion.
		* @param sessionId the session id.
		* @param inOutLanguageWeight the language weight used for generating suggestions.
		* inOutLanguageWeight is a float array that has only one element. This can be updated when the
		* different language weight is used.
		@@ -83,17 +84,7 @@ public abstract class Dictionary {
		abstract public ArrayList<SuggestedWordInfo> getSuggestions(final WordComposer composer,
		final String prevWord, final ProximityInfo proximityInfo,
		final boolean blockOffensiveWords, final int[] additionalFeaturesOptions,
		final float[] inOutLanguageWeight);

		// The default implementation of this method ignores sessionId.
		// Subclasses that want to use sessionId need to override this method.
		public ArrayList<SuggestedWordInfo> getSuggestionsWithSessionId(final WordComposer composer,
		final String prevWord, final ProximityInfo proximityInfo,
		final boolean blockOffensiveWords, final int[] additionalFeaturesOptions,
		final int sessionId, final float[] inOutLanguageWeight) {
		return getSuggestions(composer, prevWord, proximityInfo, blockOffensiveWords,
		additionalFeaturesOptions, inOutLanguageWeight);
		}
		final int sessionId, final float[] inOutLanguageWeight);

		/**
		* Checks if the given word occurs in the dictionary
		@@ -167,7 +158,7 @@ public abstract class Dictionary {
		public ArrayList<SuggestedWordInfo> getSuggestions(final WordComposer composer,
		final String prevWord, final ProximityInfo proximityInfo,
		final boolean blockOffensiveWords, final int[] additionalFeaturesOptions,
		final float[] inOutLanguageWeight) {
		final int sessionId, final float[] inOutLanguageWeight) {
		return null;
		}

java/src/com/android/inputmethod/latin/DictionaryCollection.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -59,20 +59,20 @@ public final class DictionaryCollection extends Dictionary {
		public ArrayList<SuggestedWordInfo> getSuggestions(final WordComposer composer,
		final String prevWord, final ProximityInfo proximityInfo,
		final boolean blockOffensiveWords, final int[] additionalFeaturesOptions,
		final float[] inOutLanguageWeight) {
		final int sessionId, final float[] inOutLanguageWeight) {
		final CopyOnWriteArrayList<Dictionary> dictionaries = mDictionaries;
		if (dictionaries.isEmpty()) return null;
		// To avoid creating unnecessary objects, we get the list out of the first
		// dictionary and add the rest to it if not null, hence the get(0)
		ArrayList<SuggestedWordInfo> suggestions = dictionaries.get(0).getSuggestions(composer,
		prevWord, proximityInfo, blockOffensiveWords, additionalFeaturesOptions,
		inOutLanguageWeight);
		sessionId, inOutLanguageWeight);
		if (null == suggestions) suggestions = CollectionUtils.newArrayList();
		final int length = dictionaries.size();
		for (int i = 1; i < length; ++ i) {
		final ArrayList<SuggestedWordInfo> sugg = dictionaries.get(i).getSuggestions(composer,
		prevWord, proximityInfo, blockOffensiveWords, additionalFeaturesOptions,
		inOutLanguageWeight);
		sessionId, inOutLanguageWeight);
		if (null != sugg) suggestions.addAll(sugg);
		}
		return suggestions;

java/src/com/android/inputmethod/latin/DictionaryFacilitatorForSuggest.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -455,7 +455,7 @@ public class DictionaryFacilitatorForSuggest {
		final Dictionary dictionary = dictionaries.getDict(dictType);
		if (null == dictionary) continue;
		final ArrayList<SuggestedWordInfo> dictionarySuggestions =
		dictionary.getSuggestionsWithSessionId(composer, prevWord, proximityInfo,
		dictionary.getSuggestions(composer, prevWord, proximityInfo,
		blockOffensiveWords, additionalFeaturesOptions, sessionId,
		languageWeight);
		if (null == dictionarySuggestions) continue;

java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java

+4 −13

Original line number	Diff line number	Diff line
		@@ -366,7 +366,7 @@ abstract public class ExpandableBinaryDictionary extends Dictionary {
		}

		@Override
		public ArrayList<SuggestedWordInfo> getSuggestionsWithSessionId(final WordComposer composer,
		public ArrayList<SuggestedWordInfo> getSuggestions(final WordComposer composer,
		final String prevWord, final ProximityInfo proximityInfo,
		final boolean blockOffensiveWords, final int[] additionalFeaturesOptions,
		final int sessionId, final float[] inOutLanguageWeight) {
		@@ -380,9 +380,9 @@ abstract public class ExpandableBinaryDictionary extends Dictionary {
		return null;
		}
		final ArrayList<SuggestedWordInfo> suggestions =
		mBinaryDictionary.getSuggestionsWithSessionId(composer, prevWord,
		proximityInfo, blockOffensiveWords, additionalFeaturesOptions,
		sessionId, inOutLanguageWeight);
		mBinaryDictionary.getSuggestions(composer, prevWord, proximityInfo,
		blockOffensiveWords, additionalFeaturesOptions, sessionId,
		inOutLanguageWeight);
		if (mBinaryDictionary.isCorrupted()) {
		Log.i(TAG, "Dictionary (" + mDictName +") is corrupted. "
		+ "Remove and regenerate it.");
		@@ -400,15 +400,6 @@ abstract public class ExpandableBinaryDictionary extends Dictionary {
		return null;
		}

		@Override
		public ArrayList<SuggestedWordInfo> getSuggestions(final WordComposer composer,
		final String prevWord, final ProximityInfo proximityInfo,
		final boolean blockOffensiveWords, final int[] additionalFeaturesOptions,
		final float[] inOutLanguageWeight) {
		return getSuggestionsWithSessionId(composer, prevWord, proximityInfo, blockOffensiveWords,
		additionalFeaturesOptions, 0 /* sessionId */, inOutLanguageWeight);
		}

		@Override
		public boolean isValidWord(final String word) {
		reloadDictionaryIfRequired();