Make Keyboard.setShifted return void (4f7f6173) · Commits · e / os / android_packages_inputmethods_LatinIME

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

+7 −15

Original line number	Diff line number	Diff line
		@@ -167,20 +167,14 @@ public class Keyboard {
		return !mShiftLockKeys.isEmpty();
		}

		public boolean setShiftLocked(boolean newShiftLockState) {
		public void setShiftLocked(boolean newShiftLockState) {
		for (final Key key : mShiftLockKeys) {
		// To represent "shift locked" state. The highlight is handled by background image that
		// might be a StateListDrawable.
		key.setHighlightOn(newShiftLockState);
		// To represent "shifted" state. The key might have a shifted icon.
		if (newShiftLockState && mShiftedIcons.containsKey(key)) {
		key.setIcon(mShiftedIcons.get(key));
		} else {
		key.setIcon(mUnshiftedIcons.get(key));
		}
		key.setIcon(newShiftLockState ? mShiftedIcons.get(key) : mUnshiftedIcons.get(key));
		}
		mShiftState.setShiftLocked(newShiftLockState);
		return true;
		}

		public boolean isShiftLocked() {
		@@ -191,15 +185,13 @@ public class Keyboard {
		return mShiftState.isShiftLockShifted();
		}

		public boolean setShifted(boolean newShiftState) {
		public void setShifted(boolean newShiftState) {
		if (!mShiftState.isShiftLocked()) {
		for (final Key key : mShiftKeys) {
		if (!newShiftState && !mShiftState.isShiftLocked()) {
		key.setIcon(mUnshiftedIcons.get(key));
		} else if (newShiftState && !mShiftState.isShiftedOrShiftLocked()) {
		key.setIcon(mShiftedIcons.get(key));
		key.setIcon(newShiftState ? mShiftedIcons.get(key) : mUnshiftedIcons.get(key));
		}
		}
		return mShiftState.setShifted(newShiftState);
		mShiftState.setShifted(newShiftState);
		}

		public boolean isShiftedOrShiftLocked() {

+4 −5

Original line number	Diff line number	Diff line
		@@ -421,7 +421,6 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha
		return;
		if (shiftMode == AUTOMATIC_SHIFT) {
		latinKeyboard.setAutomaticTemporaryUpperCase();
		mKeyboardView.invalidateAllKeys();
		} else {
		final boolean shifted = (shiftMode == MANUAL_SHIFT);
		// On non-distinct multi touch panel device, we should also turn off the shift locked
		@@ -431,15 +430,15 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha
		if (!hasDistinctMultitouch() && !shifted && latinKeyboard.isShiftLocked()) {
		latinKeyboard.setShiftLocked(false);
		}
		if (latinKeyboard.setShifted(shifted)) {
		mKeyboardView.invalidateAllKeys();
		}
		latinKeyboard.setShifted(shifted);
		}
		mKeyboardView.invalidateAllKeys();
		}

		private void setShiftLocked(boolean shiftLocked) {
		LatinKeyboard latinKeyboard = getLatinKeyboard();
		if (latinKeyboard != null && latinKeyboard.setShiftLocked(shiftLocked)) {
		if (latinKeyboard != null) {
		latinKeyboard.setShiftLocked(shiftLocked);
		mKeyboardView.invalidateAllKeys();
		}
		}

+2 −3

Original line number	Diff line number	Diff line
		@@ -132,10 +132,9 @@ public class MiniKeyboardView extends KeyboardView implements MoreKeysPanel {
		@Override
		public void setShifted(boolean shifted) {
		final Keyboard keyboard = getKeyboard();
		if (keyboard.setShifted(shifted)) {
		keyboard.setShifted(shifted);
		invalidateAllKeys();
		}
		}

		@Override
		public void showMoreKeysPanel(View parentView, Controller controller, int pointX, int pointY,

+1 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ public interface MoreKeysPanel extends PointerTracker.KeyEventHandler {
		public boolean dismissMoreKeysPanel();
		}

		// TODO: Remove this method.
		public void setShifted(boolean shifted);

		/**

+1 −2

Original line number	Diff line number	Diff line
		@@ -33,7 +33,7 @@ public class KeyboardShiftState {

		private int mState = NORMAL;

		public boolean setShifted(boolean newShiftState) {
		public void setShifted(boolean newShiftState) {
		final int oldState = mState;
		if (newShiftState) {
		switch (oldState) {
		@@ -61,7 +61,6 @@ public class KeyboardShiftState {
		}
		if (DEBUG)
		Log.d(TAG, "setShifted(" + newShiftState + "): " + toString(oldState) + " > " + this);
		return mState != oldState;
		}

		public void setShiftLocked(boolean newShiftLockState) {