aboutsummaryrefslogtreecommitdiffstats
path: root/java/src
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2011-07-21 14:59:50 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-07-21 14:59:50 -0700
commit68ff3a0a8b1f78c081f53c1d3cc3d966e228089e (patch)
tree8341f6a09fb0e3859e271e3d80ec1e840ad28b6f /java/src
parent035f0f5c94136fa1c209d5d209ab8f27d4ca016e (diff)
parent419b90fe86012132a1bc928608eb2e19ddc09840 (diff)
downloadlatinime-68ff3a0a8b1f78c081f53c1d3cc3d966e228089e.tar.gz
latinime-68ff3a0a8b1f78c081f53c1d3cc3d966e228089e.tar.xz
latinime-68ff3a0a8b1f78c081f53c1d3cc3d966e228089e.zip
Merge "Fix missing right edge flag"
Diffstat (limited to 'java/src')
-rw-r--r--java/src/com/android/inputmethod/keyboard/internal/KeyboardParser.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyboardParser.java b/java/src/com/android/inputmethod/keyboard/internal/KeyboardParser.java
index fcda91990..6f7349915 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/KeyboardParser.java
+++ b/java/src/com/android/inputmethod/keyboard/internal/KeyboardParser.java
@@ -632,15 +632,15 @@ public class KeyboardParser {
private void endRow() {
if (mCurrentRow == null)
throw new InflateException("orphant end row tag");
+ if (mRightEdgeKey != null) {
+ mRightEdgeKey.addEdgeFlags(Keyboard.EDGE_RIGHT);
+ mRightEdgeKey = null;
+ }
setSpacer(mCurrentX, mHorizontalEdgesPadding);
if (mCurrentX > mMaxRowWidth)
mMaxRowWidth = mCurrentX;
mCurrentY += mCurrentRow.mDefaultHeight;
mCurrentRow = null;
- if (mRightEdgeKey != null) {
- mRightEdgeKey.addEdgeFlags(Keyboard.EDGE_RIGHT);
- mRightEdgeKey = null;
- }
}
private void endKey(Key key) {