From 4f7f61730cbd45871c1e9044da84b494831f97c3 Mon Sep 17 00:00:00 2001 From: "Tadashi G. Takaoka" Date: Tue, 6 Dec 2011 14:42:30 +0900 Subject: [PATCH] Make Keyboard.setShifted return void Bug: 5708602 Change-Id: If8150f62fbab864344f59853850ff3213c27940e --- .../inputmethod/keyboard/Keyboard.java | 22 ++++++------------- .../keyboard/KeyboardSwitcher.java | 9 ++++---- .../keyboard/MiniKeyboardView.java | 5 ++--- .../inputmethod/keyboard/MoreKeysPanel.java | 1 + .../keyboard/internal/KeyboardShiftState.java | 3 +-- 5 files changed, 15 insertions(+), 25 deletions(-) diff --git a/java/src/com/android/inputmethod/keyboard/Keyboard.java b/java/src/com/android/inputmethod/keyboard/Keyboard.java index c9756de87..4262f929c 100644 --- a/java/src/com/android/inputmethod/keyboard/Keyboard.java +++ b/java/src/com/android/inputmethod/keyboard/Keyboard.java @@ -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) { - for (final Key key : mShiftKeys) { - if (!newShiftState && !mShiftState.isShiftLocked()) { - key.setIcon(mUnshiftedIcons.get(key)); - } else if (newShiftState && !mShiftState.isShiftedOrShiftLocked()) { - key.setIcon(mShiftedIcons.get(key)); + public void setShifted(boolean newShiftState) { + if (!mShiftState.isShiftLocked()) { + for (final Key key : mShiftKeys) { + key.setIcon(newShiftState ? mShiftedIcons.get(key) : mUnshiftedIcons.get(key)); } } - return mShiftState.setShifted(newShiftState); + mShiftState.setShifted(newShiftState); } public boolean isShiftedOrShiftLocked() { diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java index 65f8a79df..f1975f193 100644 --- a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java +++ b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java @@ -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(); } } diff --git a/java/src/com/android/inputmethod/keyboard/MiniKeyboardView.java b/java/src/com/android/inputmethod/keyboard/MiniKeyboardView.java index f2c5b7b49..8e9929681 100644 --- a/java/src/com/android/inputmethod/keyboard/MiniKeyboardView.java +++ b/java/src/com/android/inputmethod/keyboard/MiniKeyboardView.java @@ -132,9 +132,8 @@ public class MiniKeyboardView extends KeyboardView implements MoreKeysPanel { @Override public void setShifted(boolean shifted) { final Keyboard keyboard = getKeyboard(); - if (keyboard.setShifted(shifted)) { - invalidateAllKeys(); - } + keyboard.setShifted(shifted); + invalidateAllKeys(); } @Override diff --git a/java/src/com/android/inputmethod/keyboard/MoreKeysPanel.java b/java/src/com/android/inputmethod/keyboard/MoreKeysPanel.java index 6314a99db..a3ff37269 100644 --- a/java/src/com/android/inputmethod/keyboard/MoreKeysPanel.java +++ b/java/src/com/android/inputmethod/keyboard/MoreKeysPanel.java @@ -24,6 +24,7 @@ public interface MoreKeysPanel extends PointerTracker.KeyEventHandler { public boolean dismissMoreKeysPanel(); } + // TODO: Remove this method. public void setShifted(boolean shifted); /** diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyboardShiftState.java b/java/src/com/android/inputmethod/keyboard/internal/KeyboardShiftState.java index 28a53cedc..4a77e0735 100644 --- a/java/src/com/android/inputmethod/keyboard/internal/KeyboardShiftState.java +++ b/java/src/com/android/inputmethod/keyboard/internal/KeyboardShiftState.java @@ -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) {