diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2011-05-27 00:15:50 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2011-05-27 00:15:50 -0700 |
| commit | d0a88868ca96e466b53efd0154d36f0a8bf91bf4 (patch) | |
| tree | c5f9ceaa121e879014a6e05650aea97d90ad250e /java/res | |
| parent | b7e09a0fab67315244d6d662c56bb4e27598b88e (diff) | |
| parent | ec8cb2eb53ae8fdc45c51cf58b01384161901b97 (diff) | |
| download | latinime-d0a88868ca96e466b53efd0154d36f0a8bf91bf4.tar.gz latinime-d0a88868ca96e466b53efd0154d36f0a8bf91bf4.tar.xz latinime-d0a88868ca96e466b53efd0154d36f0a8bf91bf4.zip | |
am ec8cb2eb: Merge "Remove web mode and add webInput boolean (DO NOT MERGE)" into honeycomb-mr2
* commit 'ec8cb2eb53ae8fdc45c51cf58b01384161901b97':
Remove web mode and add webInput boolean (DO NOT MERGE)
Diffstat (limited to 'java/res')
| -rw-r--r-- | java/res/values/attrs.xml | 7 | ||||
| -rw-r--r-- | java/res/xml-sw600dp/kbd_settings.xml | 2 | ||||
| -rw-r--r-- | java/res/xml/kbd_qwerty_f1.xml | 2 | ||||
| -rw-r--r-- | java/res/xml/kbd_qwerty_row4.xml | 6 |
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 331e1510e..4f679ca93 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" |