Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b6c314e4 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka Committed by Android (Google) Code Review
Browse files

Merge "Clean up some compiler warnings" into jb-dev

parents 383f4d6a 93ebf74b

java/src/com/android/inputmethod/keyboard/PointerTracker.java

+0 −6
Original line number Diff line number Diff line
@@ -452,12 +452,6 @@ public class PointerTracker { 
        return newKey;

    }



    private Key onUpKey(int x, int y, long eventTime) {

        mUpTime = eventTime;

        mCurrentKey = null;

        return onMoveKeyInternal(x, y);

    }



    public void processMotionEvent(int action, int x, int y, long eventTime,

            KeyEventHandler handler) {

        switch (action) {

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

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import com.android.inputmethod.keyboard.Keyboard; 
 *

 * @deprecated Use {@link ContactsBinaryDictionary}.

 */

@Deprecated

public class ContactsDictionary extends ExpandableDictionary {



    private static final String[] PROJECTION = {

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

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ public abstract class Dictionary { 


    /**

     * Interface to be implemented by classes requesting words to be fetched from the dictionary.

     * @see #getWords(WordComposer, WordCallback, ProximityInfo)

     * @see #getWords(WordComposer, CharSequence, WordCallback, ProximityInfo)

     */

    public interface WordCallback {

        /**

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

+0 −1
Original line number Diff line number Diff line
@@ -89,7 +89,6 @@ public class DictionaryFactory { 
    /**

     * Initializes a dictionary from a raw resource file

     * @param context application context for reading resources

     * @param resId the resource containing the raw binary dictionary

     * @param locale the locale to use for the resource

     * @return an initialized instance of BinaryDictionary

     */

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

+2 −1
Original line number Diff line number Diff line
@@ -309,7 +309,8 @@ public class ExpandableDictionary extends Dictionary { 
     * @param word the word to insert, as an array of code points

     * @param depth the depth of the node in the tree

     * @param finalFreq the frequency for this word

     * @return whether there is still space for more words. {@see Dictionary.WordCallback#addWord}.

     * @return whether there is still space for more words.

     * @see Dictionary.WordCallback#addWord(char[], int, int, int, int, int)

     */

    private boolean addWordAndShortcutsFromNode(final Node node, final char[] word, final int depth,

            final int finalFreq, final WordCallback callback) {