Merge "Remove unused setProximityCorrectionEnabled() methods" (941f222c) · Commits · e / os / android_packages_inputmethods_LatinIME

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

+0 −9

Original line number	Diff line number	Diff line
		@@ -25,7 +25,6 @@ public class KeyDetector {
		private Keyboard mKeyboard;
		private int mCorrectionX;
		private int mCorrectionY;
		private boolean mProximityCorrectOn;

		/**
		* This class handles key detection.
		@@ -64,14 +63,6 @@ public class KeyDetector {
		return mKeyboard;
		}

		public void setProximityCorrectionEnabled(boolean enabled) {
		mProximityCorrectOn = enabled;
		}

		public boolean isProximityCorrectionEnabled() {
		return mProximityCorrectOn;
		}

		public boolean alwaysAllowsSlidingInput() {
		return false;
		}

+0 −17

Original line number	Diff line number	Diff line
		@@ -497,23 +497,6 @@ public class MainKeyboardView extends KeyboardView implements PointerTracker.Key
		mHasDistinctMultitouch = hasDistinctMultitouch;
		}

		/**
		* When enabled, calls to {@link KeyboardActionListener#onCodeInput} will include key
		* codes for adjacent keys. When disabled, only the primary key code will be
		* reported.
		* @param enabled whether or not the proximity correction is enabled
		*/
		public void setProximityCorrectionEnabled(boolean enabled) {
		mKeyDetector.setProximityCorrectionEnabled(enabled);
		}

		/**
		* Returns true if proximity correction is enabled.
		*/
		public boolean isProximityCorrectionEnabled() {
		return mKeyDetector.isProximityCorrectionEnabled();
		}

		@Override
		protected void onAttachedToWindow() {
		super.onAttachedToWindow();

+0 −1

Original line number	Diff line number	Diff line
		@@ -693,7 +693,6 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen

		inputView.setKeyPreviewPopupEnabled(mCurrentSettings.mKeyPreviewPopupOn,
		mCurrentSettings.mKeyPreviewPopupDismissDelay);
		inputView.setProximityCorrectionEnabled(true);

		if (TRACE) Debug.startMethodTracing("/data/trace/latinime");
		}