Merge "Add copy constructor to Keyboard" (17f628c5) · Commits · e / os / android_packages_inputmethods_LatinIME

java/src/com/android/inputmethod/accessibility/AccessibilityEntityProvider.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -157,7 +157,7 @@ public final class AccessibilityEntityProvider extends AccessibilityNodeProvider

		// Add the virtual children of the root View.
		final Keyboard keyboard = mKeyboardView.getKeyboard();
		final Key[] keys = keyboard.mKeys;
		final Key[] keys = keyboard.getKeys();
		for (Key key : keys) {
		final int childVirtualViewId = generateVirtualViewIdForKey(key);
		rootInfo.addChild(mKeyboardView, childVirtualViewId);
		@@ -300,7 +300,7 @@ public final class AccessibilityEntityProvider extends AccessibilityNodeProvider
		}
		mVirtualViewIdToKey.clear();

		final Key[] keys = keyboard.mKeys;
		final Key[] keys = keyboard.getKeys();
		for (Key key : keys) {
		final int virtualViewId = generateVirtualViewIdForKey(key);
		mVirtualViewIdToKey.put(virtualViewId, key);

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

+29 −3

Original line number	Diff line number	Diff line
		@@ -69,7 +69,7 @@ public class Keyboard {
		public final int mMaxMoreKeysKeyboardColumn;

		/** Array of keys and icons in this keyboard */
		public final Key[] mKeys;
		private final Key[] mKeys;
		public final Key[] mShiftKeys;
		public final Key[] mAltCodeKeysWhileTyping;
		public final KeyboardIconsSet mIconsSet;
		@@ -104,6 +104,28 @@ public class Keyboard {
		mProximityCharsCorrectionEnabled = params.mProximityCharsCorrectionEnabled;
		}

		protected Keyboard(final Keyboard keyboard) {
		mId = keyboard.mId;
		mThemeId = keyboard.mThemeId;
		mOccupiedHeight = keyboard.mOccupiedHeight;
		mOccupiedWidth = keyboard.mOccupiedWidth;
		mMostCommonKeyHeight = keyboard.mMostCommonKeyHeight;
		mMostCommonKeyWidth = keyboard.mMostCommonKeyWidth;
		mMoreKeysTemplate = keyboard.mMoreKeysTemplate;
		mMaxMoreKeysKeyboardColumn = keyboard.mMaxMoreKeysKeyboardColumn;
		mKeyVisualAttributes = keyboard.mKeyVisualAttributes;
		mTopPadding = keyboard.mTopPadding;
		mVerticalGap = keyboard.mVerticalGap;

		mKeys = keyboard.mKeys;
		mShiftKeys = keyboard.mShiftKeys;
		mAltCodeKeysWhileTyping = keyboard.mAltCodeKeysWhileTyping;
		mIconsSet = keyboard.mIconsSet;

		mProximityInfo = keyboard.mProximityInfo;
		mProximityCharsCorrectionEnabled = keyboard.mProximityCharsCorrectionEnabled;
		}

		public boolean hasProximityCharsCorrection(final int code) {
		if (!mProximityCharsCorrectionEnabled) {
		return false;
		@@ -120,6 +142,10 @@ public class Keyboard {
		return mProximityInfo;
		}

		public Key[] getKeys() {
		return mKeys;
		}

		public Key getKey(final int code) {
		if (code == Constants.CODE_UNSPECIFIED) {
		return null;
		@@ -130,7 +156,7 @@ public class Keyboard {
		return mKeyCache.valueAt(index);
		}

		for (final Key key : mKeys) {
		for (final Key key : getKeys()) {
		if (key.getCode() == code) {
		mKeyCache.put(code, key);
		return key;
		@@ -146,7 +172,7 @@ public class Keyboard {
		return true;
		}

		for (final Key key : mKeys) {
		for (final Key key : getKeys()) {
		if (key == aKey) {
		mKeyCache.put(key.getCode(), key);
		return true;

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -285,7 +285,7 @@ public class KeyboardView extends View {
		// TODO: Confirm if it's really required to draw all keys when hardware acceleration is on.
		if (drawAllKeys \|\| isHardwareAccelerated) {
		// Draw all keys.
		for (final Key key : mKeyboard.mKeys) {
		for (final Key key : mKeyboard.getKeys()) {
		onDrawKey(key, canvas, paint);
		}
		} else {

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -39,7 +39,7 @@ public final class MoreKeysDetector extends KeyDetector {

		Key nearestKey = null;
		int nearestDist = (y < 0) ? mSlideAllowanceSquareTop : mSlideAllowanceSquare;
		for (final Key key : getKeyboard().mKeys) {
		for (final Key key : getKeyboard().getKeys()) {
		final int dist = key.squaredDistanceToEdge(touchX, touchY);
		if (dist < nearestDist) {
		nearestKey = key;