diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2011-10-27 02:35:12 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2011-10-27 02:35:12 +0000 |
| commit | 37c6bbb675c5c8bad7de36b0283402a0f240db7f (patch) | |
| tree | ff302a85f3148f0e107c5984461efde1ffc1ddea /java/src | |
| parent | ab617c074571e053bffaf85b0033f819aefcadcf (diff) | |
| parent | a7c419964f46d1c354e81c5688f5da6b43428c9a (diff) | |
| download | latinime-37c6bbb675c5c8bad7de36b0283402a0f240db7f.tar.gz latinime-37c6bbb675c5c8bad7de36b0283402a0f240db7f.tar.xz latinime-37c6bbb675c5c8bad7de36b0283402a0f240db7f.zip | |
am a7c41996: Merge "Preventing infinite call of dismissMoreKeysPanel" into ics-mr1
* commit 'a7c419964f46d1c354e81c5688f5da6b43428c9a':
Preventing infinite call of dismissMoreKeysPanel
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/MiniKeyboardView.java | 11 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/latin/MoreSuggestionsView.java | 12 |
2 files changed, 16 insertions, 7 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/MiniKeyboardView.java b/java/src/com/android/inputmethod/keyboard/MiniKeyboardView.java index 0e6e129bb..f2c5b7b49 100644 --- a/java/src/com/android/inputmethod/keyboard/MiniKeyboardView.java +++ b/java/src/com/android/inputmethod/keyboard/MiniKeyboardView.java @@ -27,7 +27,6 @@ import com.android.inputmethod.keyboard.PointerTracker.DrawingProxy; import com.android.inputmethod.keyboard.PointerTracker.TimerProxy; import com.android.inputmethod.latin.R; - /** * A view that renders a virtual {@link MiniKeyboard}. It handles rendering of keys and detecting * key presses and touch movements. @@ -115,7 +114,7 @@ public class MiniKeyboardView extends KeyboardView implements MoreKeysPanel { @Override public DrawingProxy getDrawingProxy() { - return this; + return this; } @Override @@ -174,9 +173,15 @@ public class MiniKeyboardView extends KeyboardView implements MoreKeysPanel { return x; } + private boolean mIsDismissing; + @Override public boolean dismissMoreKeysPanel() { - return mController.dismissMoreKeysPanel(); + if (mIsDismissing) return false; + mIsDismissing = true; + final boolean dismissed = mController.dismissMoreKeysPanel(); + mIsDismissing = false; + return dismissed; } @Override diff --git a/java/src/com/android/inputmethod/latin/MoreSuggestionsView.java b/java/src/com/android/inputmethod/latin/MoreSuggestionsView.java index 51f6c040d..c61dd6313 100644 --- a/java/src/com/android/inputmethod/latin/MoreSuggestionsView.java +++ b/java/src/com/android/inputmethod/latin/MoreSuggestionsView.java @@ -35,7 +35,6 @@ import com.android.inputmethod.keyboard.PointerTracker.DrawingProxy; import com.android.inputmethod.keyboard.PointerTracker.KeyEventHandler; import com.android.inputmethod.keyboard.PointerTracker.TimerProxy; - /** * A view that renders a virtual {@link MoreSuggestions}. It handles rendering of keys and detecting * key presses and touch movements. @@ -125,7 +124,7 @@ public class MoreSuggestionsView extends KeyboardView implements MoreKeysPanel { @Override public DrawingProxy getDrawingProxy() { - return this; + return this; } @Override @@ -180,10 +179,15 @@ public class MoreSuggestionsView extends KeyboardView implements MoreKeysPanel { return x; } + private boolean mIsDismissing; + @Override public boolean dismissMoreKeysPanel() { - if (mController == null) return false; - return mController.dismissMoreKeysPanel(); + if (mIsDismissing) return false; + mIsDismissing = true; + final boolean dismissed = mController.dismissMoreKeysPanel(); + mIsDismissing = false; + return dismissed; } @Override |