Merge "Fix some obvious compiler warnings" (20b4c223) · Commits · e / os / android_packages_inputmethods_LatinIME

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

+5 −4

Original line number	Diff line number	Diff line
		@@ -267,12 +267,13 @@ public class InputMethodManagerCompatWrapper {
		final InputMethodSubtypeCompatWrapper currentIms = getCurrentInputMethodSubtype();
		final List<InputMethodInfoCompatWrapper> imiList = getEnabledInputMethodList();
		imiList.remove(myImi);
		final PackageManager pm = mPackageManager;
		Collections.sort(imiList, new Comparator<InputMethodInfoCompatWrapper>() {
		@Override
		public int compare(InputMethodInfoCompatWrapper imi1,
		InputMethodInfoCompatWrapper imi2) {
		final CharSequence imiId1 = imi1.loadLabel(mPackageManager) + "/" + imi1.getId();
		final CharSequence imiId2 = imi2.loadLabel(mPackageManager) + "/" + imi2.getId();
		final CharSequence imiId1 = imi1.loadLabel(pm) + "/" + imi1.getId();
		final CharSequence imiId2 = imi2.loadLabel(pm) + "/" + imi2.getId();
		return imiId1.toString().compareTo(imiId2.toString());
		}
		});
		@@ -302,6 +303,7 @@ public class InputMethodManagerCompatWrapper {
		index++;
		}

		final InputMethodServiceCompatWrapper service = mService;
		final OnClickListener buttonListener = new OnClickListener() {
		@Override
		public void onClick(DialogInterface di, int whichButton) {
		@@ -309,10 +311,9 @@ public class InputMethodManagerCompatWrapper {
		intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK
		\| Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED
		\| Intent.FLAG_ACTIVITY_CLEAR_TOP);
		mService.startActivity(intent);
		service.startActivity(intent);
		}
		};
		final InputMethodServiceCompatWrapper service = mService;
		final IBinder token = service.getWindow().getWindow().getAttributes().token;
		final OnClickListener selectionListener = new OnClickListener() {
		@Override

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -129,7 +129,7 @@ public class SuggestionSpanUtils {
		// TODO: Share the implementation for checking typed word validity between the IME
		// and the spell checker.
		final int flag = (sameAsTyped && !suggestedWords.mTypedWordValid)
		? ((int)OBJ_FLAG_EASY_CORRECT \| (int)OBJ_FLAG_MISSPELLED)
		? (OBJ_FLAG_EASY_CORRECT \| OBJ_FLAG_MISSPELLED)
		: 0;

		final Object[] args =

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -24,7 +24,7 @@ public class SuggestionsInfoCompatUtils {
		private static final Field FIELD_RESULT_ATTR_HAS_RECOMMENDED_SUGGESTIONS = CompatUtils.getField(
		SuggestionsInfo.class, "RESULT_ATTR_HAS_RECOMMENDED_SUGGESTIONS");
		private static final Integer OBJ_RESULT_ATTR_HAS_RECOMMENDED_SUGGESTIONS = (Integer) CompatUtils
		.getFieldValue(null, null, FIELD_RESULT_ATTR_HAS_RECOMMENDED_SUGGESTIONS);;
		.getFieldValue(null, null, FIELD_RESULT_ATTR_HAS_RECOMMENDED_SUGGESTIONS);
		private static final int RESULT_ATTR_HAS_RECOMMENDED_SUGGESTIONS =
		OBJ_RESULT_ATTR_HAS_RECOMMENDED_SUGGESTIONS != null
		? OBJ_RESULT_ATTR_HAS_RECOMMENDED_SUGGESTIONS : 0;
		@@ -34,7 +34,7 @@ public class SuggestionsInfoCompatUtils {

		/**
		* Returns the flag value of the attributes of the suggestions that can be obtained by
		* {@link #getSuggestionsAttributes}: this tells that the text service thinks
		* {@link SuggestionsInfo#getSuggestionsAttributes()}: this tells that the text service thinks
		* the result suggestions include highly recommended ones.
		*/
		public static int getValueOf_RESULT_ATTR_HAS_RECOMMENDED_SUGGESTIONS() {

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

+6 −6

Original line number	Diff line number	Diff line
		@@ -42,13 +42,13 @@ public interface KeyboardActionListener {
		*
		* @param primaryCode this is the code of the key that was pressed
		* @param x x-coordinate pixel of touched event. If {@link #onCodeInput} is not called by
		* {@link PointerTracker#onTouchEvent} or so, the value should be
		* {@link #NOT_A_TOUCH_COORDINATE}. If it's called on insertion from the suggestion
		* strip, it should be {@link #SUGGESTION_STRIP_COORDINATE}.
		* {@link PointerTracker} or so, the value should be {@link #NOT_A_TOUCH_COORDINATE}.
		* If it's called on insertion from the suggestion strip, it should be
		* {@link #SUGGESTION_STRIP_COORDINATE}.
		* @param y y-coordinate pixel of touched event. If {@link #onCodeInput} is not called by
		* {@link PointerTracker#onTouchEvent} or so, the value should be
		* {@link #NOT_A_TOUCH_COORDINATE}. If it's called on insertion from the suggestion
		* strip, it should be {@link #SUGGESTION_STRIP_COORDINATE}.
		* {@link PointerTracker} or so, the value should be {@link #NOT_A_TOUCH_COORDINATE}.
		* If it's called on insertion from the suggestion strip, it should be
		* {@link #SUGGESTION_STRIP_COORDINATE}.
		*/
		public void onCodeInput(int primaryCode, int x, int y);

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -252,7 +252,7 @@ public class BinaryDictionaryFileDumper {
		* also apply.
		*
		* @param input the stream to be copied.
		* @param outputFile an outputstream to copy the data to.
		* @param output an output stream to copy the data to.
		*/
		private static void checkMagicAndCopyFileTo(final BufferedInputStream input,
		final FileOutputStream output) throws FileNotFoundException, IOException {