nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Removes "customAction" value from Key.backgroundType attribute 

Bug: 17318036
Change-Id: I6a36d50ba2e69eafbb0faa049014281bd4d4ddfc
main
Tadashi G. Takaoka 2014-09-03 10:52:56 +09:00
parent 0af2472a69
commit 5a9c9649db
4 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
java/res/drawable/btn_keyboard_key_lxx_dark.xml
View File

@ -15,11 +15,6 @@
--> -->
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <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. --> <!-- Action keys. -->
<item android:state_active="true" android:state_pressed="true" <item android:state_active="true" android:state_pressed="true"
android:drawable="@drawable/btn_keyboard_key_active_pressed_lxx_dark" /> android:drawable="@drawable/btn_keyboard_key_active_pressed_lxx_dark" />

5
java/res/drawable/btn_keyboard_key_lxx_light.xml
View File

@ -15,11 +15,6 @@
--> -->
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <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. --> <!-- Action keys. -->
<item android:state_active="true" android:state_pressed="true" <item android:state_active="true" android:state_pressed="true"
android:drawable="@drawable/btn_keyboard_key_active_pressed_lxx_light" /> android:drawable="@drawable/btn_keyboard_key_active_pressed_lxx_light" />

1
java/res/values/attrs.xml
View File

@ -284,7 +284,6 @@
<enum name="stickyOff" value="3" /> <enum name="stickyOff" value="3" />
<enum name="stickyOn" value="4" /> <enum name="stickyOn" value="4" />
<enum name="action" value="5" /> <enum name="action" value="5" />
<enum name="customAction" value="6" />
</attr> </attr>
<!-- The key action flags. --> <!-- The key action flags. -->
<attr name="keyActionFlags" format="integer"> <attr name="keyActionFlags" format="integer">

4
java/src/com/android/inputmethod/keyboard/Key.java
View File

@ -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_OFF = 3;
public static final int BACKGROUND_TYPE_STICKY_ON = 4; public static final int BACKGROUND_TYPE_STICKY_ON = 4;
public static final int BACKGROUND_TYPE_ACTION = 5; public static final int BACKGROUND_TYPE_ACTION = 5;
public static final int BACKGROUND_TYPE_CUSTOM_ACTION = 6;
private final int mActionFlags; private final int mActionFlags;
private static final int ACTION_FLAGS_IS_REPEATABLE = 0x01; 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_OFF: return "stickyOff";
case BACKGROUND_TYPE_STICKY_ON: return "stickyOn"; case BACKGROUND_TYPE_STICKY_ON: return "stickyOn";
case BACKGROUND_TYPE_ACTION: return "action"; case BACKGROUND_TYPE_ACTION: return "action";
case BACKGROUND_TYPE_CUSTOM_ACTION: return "customAction";
default: return null; default: return null;
} }
} }
@ -873,8 +871,6 @@ public class Key implements Comparable<Key> {
new KeyBackgroundState(android.R.attr.state_checkable, android.R.attr.state_checked), new KeyBackgroundState(android.R.attr.state_checkable, android.R.attr.state_checked),
// 5: BACKGROUND_TYPE_ACTION // 5: BACKGROUND_TYPE_ACTION
new KeyBackgroundState(android.R.attr.state_active), new KeyBackgroundState(android.R.attr.state_active),
// 6: BACKGROUND_TYPE_CUSTOM_ACTION
new KeyBackgroundState(android.R.attr.state_active, android.R.attr.state_checked)
}; };
} }