commit 38515ae57709b5d108d67b6f958b3e856fabc83d
author Tadashi G. Takaoka <takaoka@google.com> Thu May 26 23:18:17 2011 +0900
committer Tadashi G. Takaoka <takaoka@google.com> Fri May 27 15:20:08 2011 +0900
tree ad5292aa788becb03fcf5ef4c929ddc0d892ff07
parent d8638ff34b6554eca060d7f778cd3420a0f6e777

Remove web mode and add webInput boolean (DO NOT MERGE)

Bug: 4490948
Change-Id: I4cd1af0b48d7ebcf8f4bd939e0e363e34dbfe8b7

java/res/values/attrs.xml

diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml
index fb4d97b..3bd6619 100644
--- a/java/res/values/attrs.xml
+++ b/java/res/values/attrs.xml
@@ -165,11 +165,10 @@
             <enum name="url" value="1" />
             <enum name="email" value="2" />
             <enum name="im" value="3" />
-            <enum name="web" value="4" />
-            <enum name="phone" value="5" />
-            <enum name="number" value="6" />
-            <enum name="webEmail" value="7" />
+            <enum name="phone" value="4" />
+            <enum name="number" value="5" />
         </attr>
+        <attr name="webInput" format="boolean" />
         <attr name="passwordInput" format="boolean" />
         <attr name="hasSettingsKey" format="string" />
         <attr name="voiceKeyEnabled" format="string" />

java/res/xml-sw600dp/kbd_settings.xml

diff --git a/java/res/xml-sw600dp/kbd_settings.xml b/java/res/xml-sw600dp/kbd_settings.xml
index 86dc1f7..14f7377 100644
--- a/java/res/xml-sw600dp/kbd_settings.xml
+++ b/java/res/xml-sw600dp/kbd_settings.xml
@@ -23,7 +23,7 @@
 >
     <switch>
         <case
-            latin:mode="web"
+            latin:webInput="true"
         >
             <switch>
                 <case

java/res/xml/kbd_qwerty_f1.xml

diff --git a/java/res/xml/kbd_qwerty_f1.xml b/java/res/xml/kbd_qwerty_f1.xml
index d0e2884..e89d02d 100644
--- a/java/res/xml/kbd_qwerty_f1.xml
+++ b/java/res/xml/kbd_qwerty_f1.xml
@@ -46,7 +46,7 @@
                 </case>
                 <!-- latin:hasVoiceKey="false" -->
                 <case
-                    latin:mode="web"
+                    latin:webInput="true"
                 >
                     <Key
                         latin:keyLabel="."

java/res/xml/kbd_qwerty_row4.xml

diff --git a/java/res/xml/kbd_qwerty_row4.xml b/java/res/xml/kbd_qwerty_row4.xml
index 0db0116..1e7a3fc 100644
--- a/java/res/xml/kbd_qwerty_row4.xml
+++ b/java/res/xml/kbd_qwerty_row4.xml
@@ -37,7 +37,7 @@
                     latin:keyboardLayout="@xml/kbd_qwerty_f1" />
                 <switch>
                     <case
-                        latin:mode="web"
+                        latin:webInput="true"
                     >
                         <Key
                             latin:keyStyle="spaceKeyStyle"
@@ -88,7 +88,7 @@
                     latin:keyboardLayout="@xml/kbd_qwerty_f1" />
                 <switch>
                     <case
-                        latin:mode="web"
+                        latin:webInput="true"
                     >
                         <Key
                             latin:keyStyle="spaceKeyStyle"
@@ -118,7 +118,7 @@
                             latin:keyEdgeFlags="right" />
                     </case>
                     <case
-                        latin:mode="web"
+                        latin:webInput="true"
                     >
                         <Key
                             latin:keyStyle="returnKeyStyle"