aboutsummaryrefslogtreecommitdiffstats
path: root/java/res/xml-sw600dp
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2012-03-01 21:24:01 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-03-01 21:24:01 -0800
commit3e52a10f4b39afd5291e458b38ceba70b8bc3ad4 (patch)
tree4381ae9776e38dbc3d831bd7fdb068e773244684 /java/res/xml-sw600dp
parenta3abbac47a6894ff322bbc7e75a09892bb9cfc04 (diff)
parentede2133cb137a48aabd2aefc464f68edb7fd2514 (diff)
downloadlatinime-3e52a10f4b39afd5291e458b38ceba70b8bc3ad4.tar.gz
latinime-3e52a10f4b39afd5291e458b38ceba70b8bc3ad4.tar.xz
latinime-3e52a10f4b39afd5291e458b38ceba70b8bc3ad4.zip
Merge "Support time, date, and datetime keyboard"
Diffstat (limited to 'java/res/xml-sw600dp')
-rw-r--r--java/res/xml-sw600dp/rows_number_normal.xml42
1 files changed, 34 insertions, 8 deletions
diff --git a/java/res/xml-sw600dp/rows_number_normal.xml b/java/res/xml-sw600dp/rows_number_normal.xml
index 1c38a6265..3704c5284 100644
--- a/java/res/xml-sw600dp/rows_number_normal.xml
+++ b/java/res/xml-sw600dp/rows_number_normal.xml
@@ -63,10 +63,24 @@
latin:keyLabel="/"
latin:keyStyle="numKeyStyle"
latin:keyWidth="9.25%p" />
- <Key
- latin:keyLabel=","
- latin:keyStyle="numKeyStyle"
- latin:keyWidth="9.25%p" />
+ <switch>
+ <case
+ latin:mode="time|datetime"
+ >
+ <Key
+ latin:keyLabel=","
+ latin:keyLabelFlags="hasPopupHint"
+ latin:moreKeys="@string/more_keys_for_am_pm"
+ latin:keyStyle="numKeyStyle"
+ latin:keyWidth="9.25%p" />
+ </case>
+ <default>
+ <Key
+ latin:keyLabel=","
+ latin:keyStyle="numKeyStyle"
+ latin:keyWidth="9.25%p" />
+ </default>
+ </switch>
<Key
latin:keyLabel="4"
latin:keyStyle="numKeyStyle"
@@ -94,10 +108,22 @@
latin:keyLabel=")"
latin:keyStyle="numKeyStyle"
latin:keyWidth="9.25%p" />
- <Key
- latin:keyLabel="="
- latin:keyStyle="numKeyStyle"
- latin:keyWidth="9.25%p" />
+ <switch>
+ <case
+ latin:mode="time|datetime"
+ >
+ <Key
+ latin:keyLabel=":"
+ latin:keyStyle="numKeyStyle"
+ latin:keyWidth="9.25%p" />
+ </case>
+ <default>
+ <Key
+ latin:keyLabel="="
+ latin:keyStyle="numKeyStyle"
+ latin:keyWidth="9.25%p" />
+ </default>
+ </switch>
<Key
latin:keyLabel="7"
latin:keyStyle="numKeyStyle"