aboutsummaryrefslogtreecommitdiffstats
path: root/java/res
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2011-05-26 23:18:17 +0900
committerTadashi G. Takaoka <takaoka@google.com>2011-05-27 15:20:08 +0900
commit38515ae57709b5d108d67b6f958b3e856fabc83d (patch)
treead5292aa788becb03fcf5ef4c929ddc0d892ff07 /java/res
parentd8638ff34b6554eca060d7f778cd3420a0f6e777 (diff)
downloadlatinime-38515ae57709b5d108d67b6f958b3e856fabc83d.tar.gz
latinime-38515ae57709b5d108d67b6f958b3e856fabc83d.tar.xz
latinime-38515ae57709b5d108d67b6f958b3e856fabc83d.zip
Remove web mode and add webInput boolean (DO NOT MERGE)
Bug: 4490948 Change-Id: I4cd1af0b48d7ebcf8f4bd939e0e363e34dbfe8b7
Diffstat (limited to 'java/res')
-rw-r--r--java/res/values/attrs.xml7
-rw-r--r--java/res/xml-sw600dp/kbd_settings.xml2
-rw-r--r--java/res/xml/kbd_qwerty_f1.xml2
-rw-r--r--java/res/xml/kbd_qwerty_row4.xml6
4 files changed, 8 insertions, 9 deletions
diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml
index fb4d97b8b..3bd6619d8 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" />
diff --git a/java/res/xml-sw600dp/kbd_settings.xml b/java/res/xml-sw600dp/kbd_settings.xml
index 86dc1f7e7..14f7377a8 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
diff --git a/java/res/xml/kbd_qwerty_f1.xml b/java/res/xml/kbd_qwerty_f1.xml
index d0e2884e1..e89d02d91 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="."
diff --git a/java/res/xml/kbd_qwerty_row4.xml b/java/res/xml/kbd_qwerty_row4.xml
index 0db011672..1e7a3fc5b 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"