commit 5b0c124ca888ee4ecbde9a51f11c4e9887a96636
author Tadashi G. Takaoka <takaoka@google.com> Thu Sep 15 17:54:21 2011 +0900
committer Tadashi G. Takaoka <takaoka@google.com> Thu Sep 15 18:33:01 2011 +0900
tree bc23cc0fda350627af58df5c93f72ffa6a43ef9c
parent a1b68eb1269bb51df5143ceaf1c6d8a61e288a9c

Remove Key.isStick, use backgroundType="stick" instead

Change-Id: I50e88c0870a3fe360b81f19163ca2f64ec38d8e8

java/res/values/attrs.xml

diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml
index 0451c9f..6e9461a 100644
--- a/java/res/values/attrs.xml
+++ b/java/res/values/attrs.xml
@@ -199,9 +199,8 @@
             <enum name="normal" value="0" />
             <enum name="functional" value="1" />
             <enum name="action" value="2" />
+            <enum name="sticky" value="3" />
         </attr>
-        <!-- Whether this is a toggle key. -->
-        <attr name="isSticky" format="boolean" />
         <!-- Whether long-pressing on this key will make it repeat. -->
         <attr name="isRepeatable" format="boolean" />
         <!-- The string of characters to output when this key is pressed. -->

java/res/xml-sw600dp/kbd_key_styles.xml

diff --git a/java/res/xml-sw600dp/kbd_key_styles.xml b/java/res/xml-sw600dp/kbd_key_styles.xml
index d86a01d..0b6d871 100644
--- a/java/res/xml-sw600dp/kbd_key_styles.xml
+++ b/java/res/xml-sw600dp/kbd_key_styles.xml
@@ -44,8 +44,7 @@
         latin:code="@integer/key_shift"
         latin:keyIcon="iconShiftKey"
         latin:keyIconShifted="iconShiftedShiftKey"
-        latin:backgroundType="functional"
-        latin:isSticky="true" />
+        latin:backgroundType="sticky" />
     <key-style
         latin:styleName="deleteKeyStyle"
         latin:code="@integer/key_delete"

java/res/xml-sw768dp/kbd_key_styles.xml

diff --git a/java/res/xml-sw768dp/kbd_key_styles.xml b/java/res/xml-sw768dp/kbd_key_styles.xml
index 4deb263..686e7b6 100644
--- a/java/res/xml-sw768dp/kbd_key_styles.xml
+++ b/java/res/xml-sw768dp/kbd_key_styles.xml
@@ -26,8 +26,7 @@
         latin:code="@integer/key_shift"
         latin:keyIcon="iconShiftKey"
         latin:keyIconShifted="iconShiftedShiftKey"
-        latin:backgroundType="functional"
-        latin:isSticky="true" />
+        latin:backgroundType="sticky" />
     <key-style
         latin:styleName="deleteKeyStyle"
         latin:code="@integer/key_delete"

java/res/xml/kbd_key_styles.xml

diff --git a/java/res/xml/kbd_key_styles.xml b/java/res/xml/kbd_key_styles.xml
index 9ed97b1..11b1abb 100644
--- a/java/res/xml/kbd_key_styles.xml
+++ b/java/res/xml/kbd_key_styles.xml
@@ -67,8 +67,7 @@
         latin:code="@integer/key_shift"
         latin:keyIcon="iconShiftKey"
         latin:keyIconShifted="iconShiftedShiftKey"
-        latin:backgroundType="functional"
-        latin:isSticky="true" />
+        latin:backgroundType="sticky" />
     <key-style
         latin:styleName="deleteKeyStyle"
         latin:code="@integer/key_delete"