commit d9c52ba62317aa7919483ccd157182ae0f0db7f4
author Tadashi G. Takaoka <takaoka@google.com> Fri Feb 18 14:16:29 2011 +0900
committer Tadashi G. Takaoka <takaoka@google.com> Fri Feb 18 16:56:05 2011 +0900
tree 801fea9d2dd18d78c20545e90a9ad027b4ac16b9
parent aa721c4783616e65a42fb5f234f2b3909ccdd931

Rename imeOptions attribute of Keyboard to imeAction.

Bug: 3384942
Change-Id: I3ce01b83f0ae37f447de8a7fcdb5d7fe06b108c6

java/res/values/attrs.xml

diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml
index b6d5fdc..dea1635 100644
--- a/java/res/values/attrs.xml
+++ b/java/res/values/attrs.xml
@@ -171,7 +171,7 @@
         <attr name="hasSettingsKey" format="string" />
         <attr name="voiceKeyEnabled" format="string" />
         <attr name="hasVoiceKey" format="string" />
-        <attr name="imeOptions">
+        <attr name="imeAction">
             <!-- This should be aligned with EditorInfo.IME_ACTION_* -->
             <flag name="actionUnspecified" value="0" />
             <flag name="actionNone" value="1" />

java/res/xml-xlarge/kbd_qwerty_row4.xml

diff --git a/java/res/xml-xlarge/kbd_qwerty_row4.xml b/java/res/xml-xlarge/kbd_qwerty_row4.xml
index 9d0fd81..65ca093 100644
--- a/java/res/xml-xlarge/kbd_qwerty_row4.xml
+++ b/java/res/xml-xlarge/kbd_qwerty_row4.xml
@@ -49,7 +49,7 @@
             <default>
                 <switch>
                     <case
-                        latin:imeOptions="actionSearch"
+                        latin:imeAction="actionSearch"
                     >
                         <Key
                             latin:keyLabel=":"

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 3b35f35..473510e 100644
--- a/java/res/xml/kbd_key_styles.xml
+++ b/java/res/xml/kbd_key_styles.xml
@@ -182,7 +182,7 @@
     <!-- Return key style -->
     <switch>
         <case
-            latin:imeOptions="actionGo"
+            latin:imeAction="actionGo"
         >
             <key-style
                 latin:styleName="returnKeyStyle"
@@ -191,7 +191,7 @@
                 latin:parentStyle="functionalKeyStyle" />
         </case>
         <case
-            latin:imeOptions="actionNext"
+            latin:imeAction="actionNext"
         >
             <key-style
                 latin:styleName="returnKeyStyle"
@@ -200,7 +200,7 @@
                 latin:parentStyle="functionalKeyStyle" />
         </case>
         <case
-            latin:imeOptions="actionDone"
+            latin:imeAction="actionDone"
         >
             <key-style
                 latin:styleName="returnKeyStyle"
@@ -209,7 +209,7 @@
                 latin:parentStyle="functionalKeyStyle" />
         </case>
         <case
-            latin:imeOptions="actionSend"
+            latin:imeAction="actionSend"
         >
             <key-style
                 latin:styleName="returnKeyStyle"
@@ -218,7 +218,7 @@
                 latin:parentStyle="functionalKeyStyle" />
         </case>
         <case
-            latin:imeOptions="actionSearch"
+            latin:imeAction="actionSearch"
         >
             <switch>
                 <case