aboutsummaryrefslogtreecommitdiffstats
path: root/java/res/xml-sw768dp
diff options
context:
space:
mode:
Diffstat (limited to 'java/res/xml-sw768dp')
-rw-r--r--java/res/xml-sw768dp/kbd_phone_symbols.xml (renamed from java/res/xml-sw768dp/kbd_phone_shift.xml)3
-rw-r--r--java/res/xml-sw768dp/rows_azerty.xml4
-rw-r--r--java/res/xml-sw768dp/rows_phone.xml28
-rw-r--r--java/res/xml-sw768dp/rows_phone_shift.xml153
-rw-r--r--java/res/xml-sw768dp/rows_symbols.xml24
-rw-r--r--java/res/xml-sw768dp/rows_symbols_shift.xml12
6 files changed, 34 insertions, 190 deletions
diff --git a/java/res/xml-sw768dp/kbd_phone_shift.xml b/java/res/xml-sw768dp/kbd_phone_symbols.xml
index a56afcc0c..e1a359e84 100644
--- a/java/res/xml-sw768dp/kbd_phone_shift.xml
+++ b/java/res/xml-sw768dp/kbd_phone_symbols.xml
@@ -22,6 +22,7 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
latin:keyWidth="13.250%p"
>
+ <!-- Tablet doesn't have phone symbols keyboard -->
<include
- latin:keyboardLayout="@xml/rows_phone_shift" />
+ latin:keyboardLayout="@xml/rows_phone" />
</Keyboard>
diff --git a/java/res/xml-sw768dp/rows_azerty.xml b/java/res/xml-sw768dp/rows_azerty.xml
index 886ebecaa..b9ef89822 100644
--- a/java/res/xml-sw768dp/rows_azerty.xml
+++ b/java/res/xml-sw768dp/rows_azerty.xml
@@ -124,9 +124,9 @@
latin:moreKeys="@string/more_keys_for_n" />
<Key
latin:keyLabel="\'"
- latin:keyLabelFlags="hasShiftedLetterHint"
latin:keyHintLabel=":"
- latin:moreKeys=":" />
+ latin:moreKeys=":"
+ latin:keyStyle="hasShiftedLetterHintStyle" />
<include
latin:keyboardLayout="@xml/keys_comma_period" />
<Key
diff --git a/java/res/xml-sw768dp/rows_phone.xml b/java/res/xml-sw768dp/rows_phone.xml
index da90895d0..789c02c42 100644
--- a/java/res/xml-sw768dp/rows_phone.xml
+++ b/java/res/xml-sw768dp/rows_phone.xml
@@ -33,13 +33,16 @@
<Key
latin:keyLabel="-"
latin:keyStyle="numKeyStyle"
- latin:keyXPos="20.400%p"
+ latin:keyXPos="13.829%p"
latin:keyWidth="8.047%p" />
<Key
latin:keyLabel="+"
latin:keyStyle="numKeyStyle"
latin:keyWidth="8.047%p" />
<Key
+ latin:keyStyle="numPauseKeyStyle"
+ latin:keyWidth="8.047%p" />
+ <Key
latin:keyStyle="num1KeyStyle"
latin:keyXPos="43.125%p" />
<Key
@@ -52,19 +55,22 @@
latin:keyWidth="fillRight" />
</Row>
<Row>
- <Key
- latin:keyStyle="toMoreSymbolKeyStyle"
- latin:keyWidth="11.172%p" />
+ <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
+ <Spacer
+ latin:keyWidth="13.829%p" />
<Key
latin:keyLabel=","
latin:keyStyle="numKeyStyle"
- latin:keyXPos="20.400%p"
+ latin:keyXPos="13.829%p"
latin:keyWidth="8.047%p" />
<Key
latin:keyLabel="."
latin:keyStyle="numKeyStyle"
latin:keyWidth="8.047%p" />
<Key
+ latin:keyStyle="numWaitKeyStyle"
+ latin:keyWidth="8.047%p" />
+ <Key
latin:keyStyle="num4KeyStyle"
latin:keyXPos="43.125%p" />
<Key
@@ -79,7 +85,7 @@
<Row>
<!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
<Spacer
- latin:keyWidth="20.400%p" />
+ latin:keyWidth="13.829%p" />
<Key
latin:keyLabel="("
latin:keyStyle="numKeyStyle"
@@ -89,6 +95,10 @@
latin:keyStyle="numKeyStyle"
latin:keyWidth="8.047%p" />
<Key
+ latin:keyLabel="N"
+ latin:keyStyle="numKeyStyle"
+ latin:keyWidth="8.047%p" />
+ <Key
latin:keyStyle="num7KeyStyle"
latin:keyXPos="43.125%p" />
<Key
@@ -98,7 +108,7 @@
<!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
<Spacer
latin:keyWidth="0%p" />
- </Row>
+ </Row>
<Row>
<switch>
<case latin:hasSettingsKey="true">
@@ -114,8 +124,8 @@
</switch>
<Key
latin:keyStyle="nonSpecialBackgroundSpaceKeyStyle"
- latin:keyXPos="20.400%p"
- latin:keyWidth="16.084%p" />
+ latin:keyXPos="13.829%p"
+ latin:keyWidth="24.140%p" />
<Key
latin:keyStyle="numStarKeyStyle"
latin:keyXPos="43.125%p" />
diff --git a/java/res/xml-sw768dp/rows_phone_shift.xml b/java/res/xml-sw768dp/rows_phone_shift.xml
deleted file mode 100644
index 5861998ae..000000000
--- a/java/res/xml-sw768dp/rows_phone_shift.xml
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2011, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-** http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
- <include
- latin:keyboardLayout="@xml/key_styles_common" />
- <include
- latin:keyboardLayout="@xml/key_styles_number" />
- <Row>
- <Key
- latin:keyStyle="numTabKeyStyle"
- latin:keyLabelFlags="alignLeft"
- latin:keyWidth="11.172%p" />
- <Key
- latin:keyLabel="-"
- latin:keyStyle="numKeyStyle"
- latin:keyXPos="13.829%p"
- latin:keyWidth="8.047%p" />
- <Key
- latin:keyLabel="+"
- latin:keyStyle="numKeyStyle"
- latin:keyWidth="8.047%p" />
- <Key
- latin:keyStyle="numPauseKeyStyle"
- latin:keyWidth="8.047%p" />
- <Key
- latin:keyStyle="num1KeyStyle"
- latin:keyXPos="43.125%p" />
- <Key
- latin:keyStyle="num2KeyStyle" />
- <Key
- latin:keyStyle="num3KeyStyle" />
- <Key
- latin:keyStyle="deleteKeyStyle"
- latin:keyXPos="-11.172%p"
- latin:keyWidth="fillRight" />
- </Row>
- <Row>
- <Key
- latin:keyStyle="backFromMoreSymbolKeyStyle"
- latin:keyWidth="11.172%p" />
- <Key
- latin:keyLabel=","
- latin:keyStyle="numKeyStyle"
- latin:keyXPos="13.829%p"
- latin:keyWidth="8.047%p" />
- <Key
- latin:keyLabel="."
- latin:keyStyle="numKeyStyle"
- latin:keyWidth="8.047%p" />
- <Key
- latin:keyStyle="numWaitKeyStyle"
- latin:keyWidth="8.047%p" />
- <Key
- latin:keyStyle="num4KeyStyle"
- latin:keyXPos="43.125%p" />
- <Key
- latin:keyStyle="num5KeyStyle" />
- <Key
- latin:keyStyle="num6KeyStyle" />
- <Key
- latin:keyStyle="returnKeyStyle"
- latin:keyXPos="-11.172%p"
- latin:keyWidth="fillRight" />
- </Row>
- <Row>
- <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
- <Spacer
- latin:keyWidth="13.829%p" />
- <Key
- latin:keyLabel="("
- latin:keyStyle="numKeyStyle"
- latin:keyWidth="8.047%p" />
- <Key
- latin:keyLabel=")"
- latin:keyStyle="numKeyStyle"
- latin:keyWidth="8.047%p" />
- <Key
- latin:keyLabel="N"
- latin:keyStyle="numKeyStyle"
- latin:keyWidth="8.047%p" />
- <Key
- latin:keyStyle="num7KeyStyle"
- latin:keyXPos="43.125%p" />
- <Key
- latin:keyStyle="num8KeyStyle" />
- <Key
- latin:keyStyle="num9KeyStyle" />
- <!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
- <Spacer
- latin:keyWidth="0%p" />
- </Row>
- <Row>
- <switch>
- <case latin:hasSettingsKey="true">
- <Key
- latin:keyStyle="settingsKeyStyle"
- latin:keyWidth="8.047%p" />
- </case>
- <default>
- <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
- <Spacer
- latin:keyWidth="8.047%p" />
- </default>
- </switch>
- <Key
- latin:keyStyle="nonSpecialBackgroundSpaceKeyStyle"
- latin:keyXPos="13.829%p"
- latin:keyWidth="24.140%p" />
- <Key
- latin:keyStyle="numStarKeyStyle"
- latin:keyXPos="43.125%p" />
- <Key
- latin:keyStyle="num0KeyStyle" />
- <Key
- latin:keyLabel="#"
- latin:keyStyle="numKeyStyle" />
- <switch>
- <case
- latin:shortcutKeyEnabled="true"
- >
- <Key
- latin:keyStyle="shortcutKeyStyle"
- latin:keyXPos="-8.047%p"
- latin:keyWidth="fillRight" />
- </case>
- <default>
- <!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
- <Spacer
- latin:keyWidth="0%p" />
- </default>
- </switch>
- </Row>
-</merge>
diff --git a/java/res/xml-sw768dp/rows_symbols.xml b/java/res/xml-sw768dp/rows_symbols.xml
index 7458b366a..2ba935724 100644
--- a/java/res/xml-sw768dp/rows_symbols.xml
+++ b/java/res/xml-sw768dp/rows_symbols.xml
@@ -102,12 +102,8 @@
<Key
latin:keyLabel="+"
latin:moreKeys="@string/more_keys_for_plus" />
- <Key
- latin:keyLabel="("
- latin:moreKeys="[,{,&lt;" />
- <Key
- latin:keyLabel=")"
- latin:moreKeys="],},&gt;" />
+ <include
+ latin:keyboardLayout="@xml/keys_parentheses" />
<Key
latin:keyStyle="returnKeyStyle"
latin:keyXPos="-15.704%p"
@@ -119,12 +115,8 @@
<Key
latin:keyStyle="toMoreSymbolKeyStyle"
latin:keyWidth="13.829%p" />
- <Key
- latin:keyLabel="&lt;"
- latin:moreKeys="≤,«,‹" />
- <Key
- latin:keyLabel="&gt;"
- latin:moreKeys="≥,»,›" />
+ <include
+ latin:keyboardLayout="@xml/keys_less_greater" />
<Key
latin:keyLabel="="
latin:moreKeys="≠,≈" />
@@ -133,8 +125,7 @@
latin:mode="url"
>
<Key
- latin:keyLabel="\'"
- latin:moreKeys="‘,’,‚,‛" />
+ latin:keyLabel="\'" />
</case>
<default>
<Key
@@ -181,11 +172,10 @@
latin:keyStyle="spaceKeyStyle"
latin:keyXPos="31.250%p"
latin:keyWidth="37.500%p" />
- <!-- Note: DroidSans doesn't have double-high-reversed-quotation '\u201f' glyph. -->
- <!-- latin:moreKeys="“,”,„,‟,«,»,‘,’,‚,‛" -->
<Key
latin:keyLabel="&quot;"
- latin:moreKeys="“,”,«,»,‘,’,‚,‛" />
+ latin:moreKeys="@string/more_keys_for_tablet_double_quote"
+ latin:maxMoreKeysColumn="4" />
<Key
latin:keyLabel="_" />
<switch>
diff --git a/java/res/xml-sw768dp/rows_symbols_shift.xml b/java/res/xml-sw768dp/rows_symbols_shift.xml
index 80735b697..aba9c236d 100644
--- a/java/res/xml-sw768dp/rows_symbols_shift.xml
+++ b/java/res/xml-sw768dp/rows_symbols_shift.xml
@@ -84,10 +84,8 @@
<Key
latin:keyLabel="±"
latin:moreKeys="∞" />
- <Key
- latin:keyLabel="{" />
- <Key
- latin:keyLabel="}" />
+ <include
+ latin:keyboardLayout="@xml/keys_curly_brackets" />
<Key
latin:keyStyle="returnKeyStyle"
latin:keyXPos="-15.704%p"
@@ -109,10 +107,8 @@
latin:keyLabel="™" />
<Key
latin:keyLabel="℅" />
- <Key
- latin:keyLabel="[" />
- <Key
- latin:keyLabel="]" />
+ <include
+ latin:keyboardLayout="@xml/keys_square_brackets" />
<Key
latin:keyLabel="¡" />
<Key