am ec7d6752: am 5a9c9649: Removes "customAction" value from Key.backgroundType attribute

* commit 'ec7d6752':
  Removes "customAction" value from Key.backgroundType attribute

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" />

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" />

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">

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)
         };
     }