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

Commit ce22ebc5 authored Oct 17, 2022 by Treehugger Robot Committed by Automerger Merge Worker Oct 17, 2022

Merge "Fix errorprone warnings that should be errors" am: 6d585ed7 am: 78a43f6c

Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/2256807

Change-Id: Ie8d7a908adb83e2556d7b2d27beecc0e29978173
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 2549e988 78a43f6c

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -281,7 +281,7 @@ public final class PointerTracker implements PointerTrackerQueue.Element,
		if (DEBUG_LISTENER) {
		final String output = code == Constants.CODE_OUTPUT_TEXT
		? key.getOutputText() : Constants.printableCode(code);
		Log.d(TAG, String.format("[%d] onCodeInput: %4d %4d %s%s%s", mPointerId, x, y,
		Log.d(TAG, String.format("[%d] onCodeInput: %4d %4d %s%s%s%s", mPointerId, x, y,
		output, ignoreModifierKey ? " ignoreModifier" : "",
		altersCode ? " altersCode" : "", key.isEnabled() ? "" : " disabled"));
		}

java/src/com/android/inputmethod/latin/utils/CursorAnchorInfoUtils.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -216,7 +216,7 @@ public final class CursorAnchorInfoUtils {
		if (isTopLeftVisible \|\| isBottomRightVisible) {
		characterBoundsFlags \|= CursorAnchorInfo.FLAG_HAS_VISIBLE_REGION;
		}
		if (!isTopLeftVisible \|\| !isTopLeftVisible) {
		if (!isTopLeftVisible \|\| !isBottomRightVisible) {
		characterBoundsFlags \|= CursorAnchorInfo.FLAG_HAS_INVISIBLE_REGION;
		}
		if (isRtl) {

tests/src/com/android/inputmethod/keyboard/layout/expected/ExpectedKeyOutput.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -131,7 +131,7 @@ abstract class ExpectedKeyOutput {

		@Override
		boolean hasSameKeyOutput(final String text) {
		return text.equals(text);
		return mText.equals(text);
		}

		@Override

tests/src/com/android/inputmethod/latin/makedict/Ver2DictEncoder.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -34,6 +34,7 @@ import java.util.Comparator;
		import java.util.HashMap;
		import java.util.Iterator;
		import java.util.Map.Entry;
		import java.util.Objects;

		/**
		* An implementation of DictEncoder for version 2 binary dictionary.
		@@ -100,7 +101,7 @@ public class Ver2DictEncoder implements DictEncoder {
		Collections.sort(codePointOccurrenceArray, new Comparator<Entry<Integer, Integer>>() {
		@Override
		public int compare(final Entry<Integer, Integer> a, final Entry<Integer, Integer> b) {
		if (a.getValue() != b.getValue()) {
		if (!Objects.equals(a.getValue(), b.getValue())) {
		return b.getValue().compareTo(a.getValue());
		}
		return b.getKey().compareTo(a.getKey());

tools/dicttool/tests/com/android/inputmethod/latin/dicttool/BinaryDictOffdeviceUtilsTests.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -162,7 +162,7 @@ public class BinaryDictOffdeviceUtilsTests extends TestCase {
		options.put("locale", "en_US");
		options.put("version", Integer.toString(mRandom.nextInt()));
		// Add some random options for test
		final int numberOfOptionsToAdd = mRandom.nextInt() % (MAX_NUMBER_OF_OPTIONS_TO_ADD + 1);
		final int numberOfOptionsToAdd = mRandom.nextInt(MAX_NUMBER_OF_OPTIONS_TO_ADD + 1);
		for (int i = 0; i < numberOfOptionsToAdd; ++i) {
		options.put(sWords.get(2 * i), sWords.get(2 * 1 + 1));
		}