Reduce method visibility (A88)

Change-Id: I29d6afbcba0998558c9b19287a460d9f0e410994

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

@@ -106,7 +106,7 @@ public class BinaryDictionary extends Dictionary {
     }
 
     @Override
-    public ArrayList<SuggestedWordInfo> getBigrams(final WordComposer codes,
+    protected ArrayList<SuggestedWordInfo> getBigrams(final WordComposer codes,
             final CharSequence previousWord) {
         if (mNativeDict == 0) return null;
 
@@ -145,7 +145,7 @@ public class BinaryDictionary extends Dictionary {
 
     // proximityInfo and/or prevWordForBigrams may not be null.
     @Override
-    public ArrayList<SuggestedWordInfo> getWords(final WordComposer codes,
+    protected ArrayList<SuggestedWordInfo> getWords(final WordComposer codes,
             final CharSequence prevWordForBigrams, final ProximityInfo proximityInfo) {
         final int count = getSuggestions(codes, prevWordForBigrams, proximityInfo, mOutputChars,
                 mScores, mSpaceIndices);

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

@@ -78,7 +78,7 @@ public abstract class Dictionary {
      * @param proximityInfo the object for key proximity. May be ignored by some implementations.
      * @return the list of suggestions
      */
-    abstract public ArrayList<SuggestedWordInfo> getWords(final WordComposer composer,
+    abstract protected ArrayList<SuggestedWordInfo> getWords(final WordComposer composer,
             final CharSequence prevWordForBigrams, final ProximityInfo proximityInfo);
 
     /**
@@ -87,7 +87,7 @@ public abstract class Dictionary {
      * @param previousWord the word before
      * @return the list of suggestions
      */
-    public abstract ArrayList<SuggestedWordInfo> getBigrams(final WordComposer composer,
+    abstract protected ArrayList<SuggestedWordInfo> getBigrams(final WordComposer composer,
             final CharSequence previousWord);
 
     /**

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

@@ -55,7 +55,7 @@ public class DictionaryCollection extends Dictionary {
     }
 
     @Override
-    public ArrayList<SuggestedWordInfo> getWords(final WordComposer composer,
+    protected ArrayList<SuggestedWordInfo> getWords(final WordComposer composer,
             final CharSequence prevWordForBigrams, final ProximityInfo proximityInfo) {
         final CopyOnWriteArrayList<Dictionary> dictionaries = mDictionaries;
         if (dictionaries.isEmpty()) return null;
@@ -74,7 +74,7 @@ public class DictionaryCollection extends Dictionary {
     }
 
     @Override
-    public ArrayList<SuggestedWordInfo> getBigrams(final WordComposer composer,
+    protected ArrayList<SuggestedWordInfo> getBigrams(final WordComposer composer,
             final CharSequence previousWord) {
         final CopyOnWriteArrayList<Dictionary> dictionaries = mDictionaries;
         if (dictionaries.isEmpty()) return null;

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

@@ -192,7 +192,7 @@ abstract public class ExpandableBinaryDictionary extends Dictionary {
     }
 
     @Override
-    public ArrayList<SuggestedWordInfo> getWords(final WordComposer codes,
+    protected ArrayList<SuggestedWordInfo> getWords(final WordComposer codes,
             final CharSequence prevWordForBigrams, final ProximityInfo proximityInfo) {
         asyncReloadDictionaryIfRequired();
         return getWordsInner(codes, prevWordForBigrams, proximityInfo);
@@ -215,7 +215,7 @@ abstract public class ExpandableBinaryDictionary extends Dictionary {
     }
 
     @Override
-    public ArrayList<SuggestedWordInfo> getBigrams(final WordComposer codes,
+    protected ArrayList<SuggestedWordInfo> getBigrams(final WordComposer codes,
             final CharSequence previousWord) {
         asyncReloadDictionaryIfRequired();
         return getBigramsInner(codes, previousWord);

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

@@ -247,7 +247,7 @@ public class ExpandableDictionary extends Dictionary {
     }
 
     @Override
-    public ArrayList<SuggestedWordInfo> getWords(final WordComposer codes,
+    protected ArrayList<SuggestedWordInfo> getWords(final WordComposer codes,
             final CharSequence prevWordForBigrams, final ProximityInfo proximityInfo) {
         if (reloadDictionaryIfRequired()) return null;
         if (codes.size() >= BinaryDictionary.MAX_WORD_LENGTH) {
@@ -270,7 +270,7 @@ public class ExpandableDictionary extends Dictionary {
     }
 
     @Override
-    public ArrayList<SuggestedWordInfo> getBigrams(final WordComposer codes,
+    protected ArrayList<SuggestedWordInfo> getBigrams(final WordComposer codes,
             final CharSequence previousWord) {
         if (reloadDictionaryIfRequired()) return null;
         final ArrayList<SuggestedWordInfo> suggestions = new ArrayList<SuggestedWordInfo>();

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

@@ -32,7 +32,7 @@ public class SynchronouslyLoadedContactsBinaryDictionary extends ContactsBinaryD
     }
 
     @Override
-    public synchronized ArrayList<SuggestedWordInfo> getWords(final WordComposer codes,
+    protected synchronized ArrayList<SuggestedWordInfo> getWords(final WordComposer codes,
             final CharSequence prevWordForBigrams, final ProximityInfo proximityInfo) {
         syncReloadDictionaryIfRequired();
         return getWordsInner(codes, prevWordForBigrams, proximityInfo);

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

@@ -35,7 +35,7 @@ public class SynchronouslyLoadedUserBinaryDictionary extends UserBinaryDictionar
     }
 
     @Override
-    public synchronized ArrayList<SuggestedWordInfo> getWords(final WordComposer codes,
+    protected synchronized ArrayList<SuggestedWordInfo> getWords(final WordComposer codes,
             final CharSequence prevWordForBigrams, final ProximityInfo proximityInfo) {
         syncReloadDictionaryIfRequired();
         return getWordsInner(codes, prevWordForBigrams, proximityInfo);

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

@@ -161,7 +161,7 @@ public class UserHistoryDictionary extends ExpandableDictionary {
     }
 
     @Override
-    public ArrayList<SuggestedWordInfo> getWords(final WordComposer composer,
+    protected ArrayList<SuggestedWordInfo> getWords(final WordComposer composer,
             final CharSequence prevWord, final ProximityInfo proximityInfo) {
         // User history unigrams are not used at this moment. Implement this method to make them
         // useful.

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

@@ -92,7 +92,7 @@ public class WhitelistDictionary extends ExpandableDictionary {
     }
 
     @Override
-    public ArrayList<SuggestedWordInfo> getWords(final WordComposer composer,
+    protected ArrayList<SuggestedWordInfo> getWords(final WordComposer composer,
             final CharSequence prevWord, final ProximityInfo proximityInfo) {
         // Whitelist does not supply suggestions (actually it should not even implement the
         // Dictionary interface, as it responds to none of it, but it does for legacy reasons)