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

Commit 5cc606ac authored by Jean Chalard's avatar Jean Chalard Committed by Android Git Automerger
Browse files

am 8d46ea91: Merge "Fix some warnings" 

* commit '8d46ea91':
  Fix some warnings
parents 81fb25ae 8d46ea91

java/src/com/android/inputmethod/compat/SuggestionSpanUtils.java

+1 −3
Original line number Diff line number Diff line
@@ -32,8 +32,6 @@ import java.lang.reflect.Field; 
import java.util.ArrayList;



public final class SuggestionSpanUtils {

    private static final String TAG = SuggestionSpanUtils.class.getSimpleName();



    // Note that SuggestionSpan.FLAG_AUTO_CORRECTION has been introduced

    // in API level 15 (Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1).

    public static final Field FIELD_FLAG_AUTO_CORRECTION = CompatUtils.getField(
@@ -60,7 +58,7 @@ public final class SuggestionSpanUtils { 
        }

        final Spannable spannable = new SpannableString(text);

        final SuggestionSpan suggestionSpan = new SuggestionSpan(context, null /* locale */,

                new String[] {} /* suggestions */, (int)OBJ_FLAG_AUTO_CORRECTION,

                new String[] {} /* suggestions */, OBJ_FLAG_AUTO_CORRECTION,

                SuggestionSpanPickedNotificationReceiver.class);

        spannable.setSpan(suggestionSpan, 0, text.length(),

                Spanned.SPAN_EXCLUSIVE_EXCLUSIVE | Spanned.SPAN_COMPOSING);

java/src/com/android/inputmethod/dictionarypack/DictionaryProvider.java

+0 −1
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ public final class DictionaryProvider extends ContentProvider { 
    private static final String QUERY_PARAMETER_MAY_PROMPT_USER = "mayPrompt";

    private static final String QUERY_PARAMETER_TRUE = "true";

    private static final String QUERY_PARAMETER_DELETE_RESULT = "result";

    private static final String QUERY_PARAMETER_SUCCESS = "success";

    private static final String QUERY_PARAMETER_FAILURE = "failure";

    public static final String QUERY_PARAMETER_PROTOCOL_VERSION = "protocol";

    private static final int NO_MATCH = 0;

java/src/com/android/inputmethod/dictionarypack/DictionaryService.java

+0 −2
Original line number Diff line number Diff line
@@ -50,8 +50,6 @@ import java.util.concurrent.TimeUnit; 
 *     to access, and mark the current state as such.

 */

public final class DictionaryService extends Service {

    private static final String TAG = DictionaryService.class.getName();



    /**

     * The package name, to use in the intent actions.

     */

java/src/com/android/inputmethod/dictionarypack/EventHandler.java

+0 −2
Original line number Diff line number Diff line
@@ -21,8 +21,6 @@ import android.content.Context; 
import android.content.Intent;



public final class EventHandler extends BroadcastReceiver {

    private static final String TAG = EventHandler.class.getName();



    /**

     * Receives a intent broadcast.

     *

java/src/com/android/inputmethod/keyboard/internal/KeyboardState.java

+2 −2
Original line number Diff line number Diff line
@@ -29,8 +29,8 @@ import com.android.inputmethod.latin.utils.RecapitalizeStatus; 
 *

 * The input events are {@link #onLoadKeyboard()}, {@link #onSaveKeyboardState()},

 * {@link #onPressKey(int,boolean,int)}, {@link #onReleaseKey(int,boolean)},

 * {@link #onCodeInput(int,int)}, {@link #onFinishSlidingInput()}, {@link #onCancelInput()},

 * {@link #onUpdateShiftState(int,int)}.

 * {@link #onCodeInput(int,int)}, {@link #onFinishSlidingInput()},

 * {@link #onUpdateShiftState(int,int)}, {@link #onResetKeyboardStateToAlphabet()}.

 *

 * The actions are {@link SwitchActions}'s methods.

 */