diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-09-03 18:08:43 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-09-03 18:08:43 +0000 |
| commit | 342dee90e4b1218a8ad76da778826d01b9177aa4 (patch) | |
| tree | dce83eb4e14d53b676961ecf18d20ebf3d6cacd4 /java/src | |
| parent | 00415b00725feae0b4924449ba13132e7f770578 (diff) | |
| parent | 964877a8f29aaeda32b50bb829186ce88b2de2e0 (diff) | |
| download | latinime-342dee90e4b1218a8ad76da778826d01b9177aa4.tar.gz latinime-342dee90e4b1218a8ad76da778826d01b9177aa4.tar.xz latinime-342dee90e4b1218a8ad76da778826d01b9177aa4.zip | |
am 964877a8: am c297197b: am 1c2cf719: Add new value "spacebar" to Key.backgroundType attribute
* commit '964877a8f29aaeda32b50bb829186ce88b2de2e0':
Add new value "spacebar" to Key.backgroundType attribute
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/Key.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/Key.java b/java/src/com/android/inputmethod/keyboard/Key.java index 099b42a2b..efa527e15 100644 --- a/java/src/com/android/inputmethod/keyboard/Key.java +++ b/java/src/com/android/inputmethod/keyboard/Key.java @@ -139,6 +139,7 @@ public class Key implements Comparable<Key> { public static final int BACKGROUND_TYPE_STICKY_OFF = 3; public static final int BACKGROUND_TYPE_STICKY_ON = 4; public static final int BACKGROUND_TYPE_ACTION = 5; + public static final int BACKGROUND_TYPE_SPACEBAR = 6; private final int mActionFlags; private static final int ACTION_FLAGS_IS_REPEATABLE = 0x01; @@ -505,6 +506,7 @@ public class Key implements Comparable<Key> { case BACKGROUND_TYPE_STICKY_OFF: return "stickyOff"; case BACKGROUND_TYPE_STICKY_ON: return "stickyOn"; case BACKGROUND_TYPE_ACTION: return "action"; + case BACKGROUND_TYPE_SPACEBAR: return "spacebar"; default: return null; } } @@ -887,6 +889,8 @@ public class Key implements Comparable<Key> { new KeyBackgroundState(android.R.attr.state_checkable, android.R.attr.state_checked), // 5: BACKGROUND_TYPE_ACTION new KeyBackgroundState(android.R.attr.state_active), + // 6: BACKGROUND_TYPE_SPACEBAR + new KeyBackgroundState(), }; } @@ -900,7 +904,7 @@ public class Key implements Comparable<Key> { final Drawable background; if (mBackgroundType == BACKGROUND_TYPE_FUNCTIONAL) { background = functionalKeyBackground; - } else if (getCode() == Constants.CODE_SPACE) { + } else if (mBackgroundType == BACKGROUND_TYPE_SPACEBAR) { background = spacebarBackground; } else { background = keyBackground; |