diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-09-03 17:55:53 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-09-03 17:55:53 +0000 |
| commit | e3552746423bc2a14410643ec789ceba7be982ee (patch) | |
| tree | 289bb4b4de197d198113ff450d39d9b3edc5c047 /java | |
| parent | 6a4e9218ca5a851764192e6fbb6242475e737383 (diff) | |
| parent | ec7d67529e0dd4e5bf87e3b96c4b78db44adb96f (diff) | |
| download | latinime-e3552746423bc2a14410643ec789ceba7be982ee.tar.gz latinime-e3552746423bc2a14410643ec789ceba7be982ee.tar.xz latinime-e3552746423bc2a14410643ec789ceba7be982ee.zip | |
am ec7d6752: am 5a9c9649: Removes "customAction" value from Key.backgroundType attribute
* commit 'ec7d67529e0dd4e5bf87e3b96c4b78db44adb96f':
Removes "customAction" value from Key.backgroundType attribute
Diffstat (limited to 'java')
| -rw-r--r-- | java/res/drawable/btn_keyboard_key_lxx_dark.xml | 5 | ||||
| -rw-r--r-- | java/res/drawable/btn_keyboard_key_lxx_light.xml | 5 | ||||
| -rw-r--r-- | java/res/values/attrs.xml | 1 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/Key.java | 4 |
4 files changed, 0 insertions, 15 deletions
diff --git a/java/res/drawable/btn_keyboard_key_lxx_dark.xml b/java/res/drawable/btn_keyboard_key_lxx_dark.xml index c82c13829..bb1789ae3 100644 --- a/java/res/drawable/btn_keyboard_key_lxx_dark.xml +++ b/java/res/drawable/btn_keyboard_key_lxx_dark.xml @@ -15,11 +15,6 @@ --> <selector xmlns:android="http://schemas.android.com/apk/res/android"> - <!-- Custom label action keys. --> - <item android:state_active="true" android:state_checked="true" android:state_pressed="true" - android:drawable="@color/key_background_pressed_lxx_dark" /> - <item android:state_active="true" android:state_checked="true" - android:drawable="@color/key_background_lxx_dark" /> <!-- Action keys. --> <item android:state_active="true" android:state_pressed="true" android:drawable="@drawable/btn_keyboard_key_active_pressed_lxx_dark" /> diff --git a/java/res/drawable/btn_keyboard_key_lxx_light.xml b/java/res/drawable/btn_keyboard_key_lxx_light.xml index f237fbea9..60fe02dd2 100644 --- a/java/res/drawable/btn_keyboard_key_lxx_light.xml +++ b/java/res/drawable/btn_keyboard_key_lxx_light.xml @@ -15,11 +15,6 @@ --> <selector xmlns:android="http://schemas.android.com/apk/res/android"> - <!-- Custom label action keys. --> - <item android:state_active="true" android:state_checked="true" android:state_pressed="true" - android:drawable="@color/key_background_pressed_lxx_light" /> - <item android:state_active="true" android:state_checked="true" - android:drawable="@color/key_background_lxx_light" /> <!-- Action keys. --> <item android:state_active="true" android:state_pressed="true" android:drawable="@drawable/btn_keyboard_key_active_pressed_lxx_light" /> diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml index 254ef8c0d..009df7932 100644 --- a/java/res/values/attrs.xml +++ b/java/res/values/attrs.xml @@ -284,7 +284,6 @@ <enum name="stickyOff" value="3" /> <enum name="stickyOn" value="4" /> <enum name="action" value="5" /> - <enum name="customAction" value="6" /> </attr> <!-- The key action flags. --> <attr name="keyActionFlags" format="integer"> 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) }; } |