diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2012-03-07 01:53:10 -0800 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2012-03-07 01:53:10 -0800 |
| commit | cb8d5fa7e24cf00f59f9c5005b3b214bc681d142 (patch) | |
| tree | 9aa05ba71e92b2d011d7a53ba395e6c24a0a6f61 /java/src | |
| parent | dab392c6f4f5e02be36cde370758a3450bc85fb8 (diff) | |
| parent | 8e14e783771fb45c3c161123fcd3fb8d4e6fbd88 (diff) | |
| download | latinime-cb8d5fa7e24cf00f59f9c5005b3b214bc681d142.tar.gz latinime-cb8d5fa7e24cf00f59f9c5005b3b214bc681d142.tar.xz latinime-cb8d5fa7e24cf00f59f9c5005b3b214bc681d142.zip | |
Merge "Fix duplicate flag value in Key"
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/Key.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/Key.java b/java/src/com/android/inputmethod/keyboard/Key.java index 79c7ce0fd..f3923834b 100644 --- a/java/src/com/android/inputmethod/keyboard/Key.java +++ b/java/src/com/android/inputmethod/keyboard/Key.java @@ -108,8 +108,8 @@ public class Key { private static final int MORE_KEYS_COLUMN_MASK = 0x000000ff; private static final int MORE_KEYS_FLAGS_FIXED_COLUMN_ORDER = 0x80000000; private static final int MORE_KEYS_FLAGS_HAS_LABELS = 0x40000000; - private static final int MORE_KEYS_FLAGS_NEEDS_DIVIDERS = 0x40000000; - private static final int MORE_KEYS_FLAGS_EMBEDDED_MORE_KEY = 0x20000000; + private static final int MORE_KEYS_FLAGS_NEEDS_DIVIDERS = 0x20000000; + private static final int MORE_KEYS_FLAGS_EMBEDDED_MORE_KEY = 0x10000000; private static final String MORE_KEYS_AUTO_COLUMN_ORDER = "!autoColumnOrder!"; private static final String MORE_KEYS_FIXED_COLUMN_ORDER = "!fixedColumnOrder!"; private static final String MORE_KEYS_HAS_LABELS = "!hasLabels!"; |