diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-09-03 18:08:42 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-09-03 18:08:42 +0000 |
| commit | 00415b00725feae0b4924449ba13132e7f770578 (patch) | |
| tree | d1130191e9fd38cff00f45ad72debe01581c3840 /java/src | |
| parent | 1763525c9280cfe49dbdf7bf37a4e7e7727f7c84 (diff) | |
| parent | e3552746423bc2a14410643ec789ceba7be982ee (diff) | |
| download | latinime-00415b00725feae0b4924449ba13132e7f770578.tar.gz latinime-00415b00725feae0b4924449ba13132e7f770578.tar.xz latinime-00415b00725feae0b4924449ba13132e7f770578.zip | |
am e3552746: am ec7d6752: am 5a9c9649: Removes "customAction" value from Key.backgroundType attribute
* commit 'e3552746423bc2a14410643ec789ceba7be982ee':
Removes "customAction" value from Key.backgroundType attribute
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/Key.java | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/Key.java b/java/src/com/android/inputmethod/keyboard/Key.java index 05334c7f4..099b42a2b 100644 --- a/java/src/com/android/inputmethod/keyboard/Key.java +++ b/java/src/com/android/inputmethod/keyboard/Key.java @@ -139,7 +139,6 @@ 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_CUSTOM_ACTION = 6; private final int mActionFlags; private static final int ACTION_FLAGS_IS_REPEATABLE = 0x01; @@ -506,7 +505,6 @@ 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_CUSTOM_ACTION: return "customAction"; default: return null; } } @@ -889,8 +887,6 @@ 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_CUSTOM_ACTION - new KeyBackgroundState(android.R.attr.state_active, android.R.attr.state_checked) }; } |