Skip to content
Snippets Groups Projects
Commit 01127fad authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka Committed by Android (Google) Code Review
Browse files

Merge "Tweak keyboard layout size a bit"

parents 6747b30a 79dcd270
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 92 additions and 64 deletions
java/res/xml-iw/keyboard_set.xml
+ 2
− 2
View file @ 01127fad
......@@ -26,10 +26,10 @@
latin:enableProximityCharsCorrection="true" />
<Element
latin:elementName="symbols"
latin:elementKeyboard="@xml/kbd_symbols" />
latin:elementKeyboard="@xml/kbd_hebrew_symbols" />
<Element
latin:elementName="symbolsShifted"
latin:elementKeyboard="@xml/kbd_symbols_shift" />
latin:elementKeyboard="@xml/kbd_hebrew_symbols_shift" />
<Element
latin:elementName="phone"
latin:elementKeyboard="@xml/kbd_phone" />
......
java/res/xml-sw600dp/kbd_hebrew_symbols.xml 0 → 100644
+ 26
− 0
View file @ 01127fad
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
**
** Copyright 2012, 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.
*/
-->
<Keyboard
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
latin:keyboardLayout="@xml/rows_10_10_7_symbols" />
</Keyboard>
java/res/xml-sw600dp/kbd_hebrew_symbols_shift.xml 0 → 100644
+ 26
− 0
View file @ 01127fad
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
**
** Copyright 2012, 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.
*/
-->
<Keyboard
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
latin:keyboardLayout="@xml/rows_10_10_7_symbols_shift" />
</Keyboard>
java/res/xml-sw768dp/rows_10_10_7_symbols.xml
+ 0
− 2
View file @ 01127fad
......@@ -36,7 +36,6 @@
latin:keyboardLayout="@xml/rowkeys_symbols1" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyXPos="-9.219%p"
latin:keyWidth="fillRight" />
</Row>
<Row
......@@ -50,7 +49,6 @@
latin:keyboardLayout="@xml/rowkeys_symbols2" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyXPos="-15.704%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
......
java/res/xml-sw768dp/rows_10_10_7_symbols_shift.xml
+ 0
− 2
View file @ 01127fad
......@@ -36,7 +36,6 @@
latin:keyboardLayout="@xml/rowkeys_symbols_shift1" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyXPos="-9.219%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
......@@ -50,7 +49,6 @@
latin:keyboardLayout="@xml/rowkeys_symbols_shift2" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyXPos="-15.704%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
......
java/res/xml-sw768dp/rows_arabic.xml
+ 3
− 5
View file @ 01127fad
......@@ -29,12 +29,11 @@
<Key
latin:keyStyle="tabKeyStyle"
latin:keyLabelFlags="alignLeft"
latin:keyWidth="7.500%p" />
latin:keyWidth="7.969%p" />
<include
latin:keyboardLayout="@xml/rowkeys_arabic1" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyXPos="-11.500%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
......@@ -43,12 +42,11 @@
<Key
latin:keyStyle="toSymbolKeyStyle"
latin:keyLabelFlags="alignLeft"
latin:keyWidth="9.375%p" />
latin:keyWidth="11.172%p" />
<include
latin:keyboardLayout="@xml/rowkeys_arabic2" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyXPos="-9.375%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
......@@ -56,7 +54,7 @@
>
<include
latin:keyboardLayout="@xml/rowkeys_arabic3"
latin:keyXPos="12.750%p" />
latin:keyXPos="13.829%p" />
</Row>
<include
latin:keyboardLayout="@xml/row_qwerty4" />
......
java/res/xml-sw768dp/rows_azerty.xml
+ 0
− 3
View file @ 01127fad
......@@ -35,7 +35,6 @@
latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyXPos="-9.219%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
......@@ -49,7 +48,6 @@
latin:keyboardLayout="@xml/rowkeys_azerty2" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyXPos="-15.704%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
......@@ -64,7 +62,6 @@
latin:keyboardLayout="@xml/keys_comma_period" />
<Key
latin:keyStyle="shiftKeyStyle"
latin:keyXPos="-13.750%p"
latin:keyWidth="fillBoth" />
</Row>
<include
......
java/res/xml-sw768dp/rows_bulgarian.xml
+ 6
− 5
View file @ 01127fad
......@@ -24,11 +24,12 @@
<include
latin:keyboardLayout="@xml/key_styles_common" />
<Row
latin:keyWidth="7.333%p"
latin:keyWidth="7.186%p"
>
<Key
latin:keyStyle="tabKeyStyle"
latin:keyLabelFlags="alignLeft" />
latin:keyLabelFlags="alignLeft"
latin:keyWidth="7.969%p" />
<include
latin:keyboardLayout="@xml/rowkeys_bulgarian1"
latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />
......@@ -37,12 +38,12 @@
latin:keyWidth="fillBoth" />
</Row>
<Row
latin:keyWidth="7.194%p"
latin:keyWidth="7.186%p"
>
<Key
latin:keyStyle="toSymbolKeyStyle"
latin:keyLabelFlags="alignLeft"
latin:keyWidth="9.375%p" />
latin:keyWidth="11.172%p" />
<include
latin:keyboardLayout="@xml/rowkeys_bulgarian2" />
<Key
......@@ -54,7 +55,7 @@
>
<Key
latin:keyStyle="shiftKeyStyle"
latin:keyWidth="14.375%p" />
latin:keyWidth="13.829%p" />
<include
latin:keyboardLayout="@xml/rowkeys_bulgarian3" />
<include
......
java/res/xml-sw768dp/rows_east_slavic.xml
+ 7
− 7
View file @ 01127fad
......@@ -24,11 +24,12 @@
<include
latin:keyboardLayout="@xml/key_styles_common" />
<Row
latin:keyWidth="7.125%p"
latin:keyWidth="7.000%p"
>
<Key
latin:keyStyle="tabKeyStyle"
latin:keyLabelFlags="alignLeft" />
latin:keyLabelFlags="alignLeft"
latin:keyWidth="7.969%p" />
<include
latin:keyboardLayout="@xml/rowkeys_east_slavic1"
latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />
......@@ -40,25 +41,24 @@
latin:keyWidth="fillBoth" />
</Row>
<Row
latin:keyWidth="7.125%p"
latin:keyWidth="7.000%p"
>
<Key
latin:keyStyle="toSymbolKeyStyle"
latin:keyLabelFlags="alignLeft"
latin:keyWidth="9.375%p" />
latin:keyWidth="11.172%p" />
<include
latin:keyboardLayout="@xml/rowkeys_east_slavic2" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyXPos="-9.375%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
latin:keyWidth="7.125%p"
latin:keyWidth="7.000%p"
>
<Key
latin:keyStyle="shiftKeyStyle"
latin:keyWidth="12.750%p" />
latin:keyWidth="13.829%p" />
<include
latin:keyboardLayout="@xml/rowkeys_east_slavic3" />
<include
......
java/res/xml-sw768dp/rows_farsi.xml
+ 3
− 3
View file @ 01127fad
......@@ -24,11 +24,12 @@
<include
latin:keyboardLayout="@xml/key_styles_common" />
<Row
latin:keyWidth="7.125%p"
latin:keyWidth="7.000%p"
>
<Key
latin:keyStyle="tabKeyStyle"
latin:keyLabelFlags="alignLeft" />
latin:keyLabelFlags="alignLeft"
latin:keyWidth="7.969%p" />
<include
latin:keyboardLayout="@xml/rowkeys_farsi1" />
<Key
......@@ -46,7 +47,6 @@
latin:keyboardLayout="@xml/rowkeys_farsi2" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyXPos="-9.375%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
......
java/res/xml-sw768dp/rows_georgian.xml
+ 0
− 2
View file @ 01127fad
......@@ -35,7 +35,6 @@
latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyXPos="-9.219%p"
latin:keyWidth="fillBoth"/>
</Row>
<Row
......@@ -49,7 +48,6 @@
latin:keyboardLayout="@xml/rowkeys_georgian2" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyXPos="-15.704%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
......
java/res/xml-sw768dp/rows_greek.xml
+ 0
− 2
View file @ 01127fad
......@@ -47,7 +47,6 @@
latin:keyboardLayout="@xml/rowkeys_greek2" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyXPos="-15.704%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
......@@ -62,7 +61,6 @@
latin:keyboardLayout="@xml/keys_comma_period" />
<Key
latin:keyStyle="shiftKeyStyle"
latin:keyXPos="-13.750%p"
latin:keyWidth="fillBoth" />
</Row>
<include
......
java/res/xml-sw768dp/rows_hebrew.xml
+ 5
− 7
View file @ 01127fad
......@@ -36,7 +36,6 @@
latin:keyboardLayout="@xml/rowkeys_hebrew1" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyXPos="-12.000%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
......@@ -45,20 +44,19 @@
<Key
latin:keyStyle="toSymbolKeyStyle"
latin:keyLabelFlags="alignLeft"
latin:keyWidth="11.172%p" />
latin:keyWidth="10.167%p" />
<include
latin:keyboardLayout="@xml/rowkeys_hebrew2" />
</Row>
<Key
latin:keyStyle="enterKeyStyle"
latin:keyWidth="fillBoth" />
</Row>
<Row
latin:keyWidth="8.047%p"
>
<include
latin:keyboardLayout="@xml/rowkeys_hebrew3"
latin:keyXPos="13.829%p" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyXPos="-10.400%p"
latin:keyWidth="fillBoth" />
</Row>
<include
latin:keyboardLayout="@xml/row_qwerty4" />
......
java/res/xml-sw768dp/rows_nordic.xml
+ 6
− 8
View file @ 01127fad
......@@ -29,42 +29,40 @@
<Key
latin:keyStyle="tabKeyStyle"
latin:keyLabelFlags="alignLeft"
latin:keyWidth="7.500%p" />
latin:keyWidth="7.969%p" />
<include
latin:keyboardLayout="@xml/rowkeys_nordic1"
latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyXPos="-11.500%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
latin:keyWidth="7.375%p"
latin:keyWidth="7.227%p"
>
<Key
latin:keyStyle="toSymbolKeyStyle"
latin:keyLabelFlags="alignLeft"
latin:keyWidth="9.375%p" />
latin:keyWidth="11.172%p" />
<include
latin:keyboardLayout="@xml/rowkeys_nordic2" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyXPos="-9.375%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
latin:keyWidth="7.375%p"
latin:keyWidth="7.227%p"
>
<Key
latin:keyStyle="shiftKeyStyle"
latin:keyWidth="12.750%p" />
latin:keyWidth="13.829%p" />
<include
latin:keyboardLayout="@xml/rowkeys_qwerty3" />
<include
latin:keyboardLayout="@xml/keys_comma_period" />
<Key
latin:keyStyle="shiftKeyStyle"
latin:keyXPos="-12.750%p"
latin:keyXPos="-13.750%p"
latin:keyWidth="fillRight" />
</Row>
<include
......
java/res/xml-sw768dp/rows_qwerty.xml
+ 0
− 2
View file @ 01127fad
......@@ -35,7 +35,6 @@
latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyXPos="-9.219%p"
latin:keyWidth="fillBoth"/>
</Row>
<Row
......@@ -49,7 +48,6 @@
latin:keyboardLayout="@xml/rowkeys_qwerty2" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyXPos="-15.704%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
......
java/res/xml-sw768dp/rows_qwertz.xml
+ 0
− 2
View file @ 01127fad
......@@ -35,7 +35,6 @@
latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyXPos="-9.219%p"
latin:keyWidth="fillBoth"/>
</Row>
<Row
......@@ -49,7 +48,6 @@
latin:keyboardLayout="@xml/rowkeys_qwerty2" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyXPos="-15.704%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
......
java/res/xml-sw768dp/rows_south_slavic.xml
+ 8
− 6
View file @ 01127fad
......@@ -24,21 +24,21 @@
<include
latin:keyboardLayout="@xml/key_styles_common" />
<Row
latin:keyWidth="7.125%p"
latin:keyWidth="7.000%p"
>
<Key
latin:keyStyle="tabKeyStyle"
latin:keyLabelFlags="alignLeft" />
latin:keyLabelFlags="alignLeft"
latin:keyWidth="7.969%p" />
<include
latin:keyboardLayout="@xml/rowkeys_south_slavic1"
latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyXPos="-9.219%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
latin:keyWidth="7.250%p"
latin:keyWidth="7.000%p"
>
<Key
latin:keyStyle="toSymbolKeyStyle"
......@@ -48,11 +48,10 @@
latin:keyboardLayout="@xml/rowkeys_south_slavic2" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyXPos="-15.704%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
latin:keyWidth="7.250%p"
latin:keyWidth="7.000%p"
>
<Key
latin:keyStyle="shiftKeyStyle"
......@@ -61,6 +60,9 @@
latin:keyboardLayout="@xml/rowkeys_south_slavic3" />
<include
latin:keyboardLayout="@xml/keys_comma_period" />
<Key
latin:keyStyle="shiftKeyStyle"
latin:keyWidth="fillBoth" />
</Row>
<include
latin:keyboardLayout="@xml/row_qwerty4" />
......
java/res/xml-sw768dp/rows_spanish.xml
+ 0
− 2
View file @ 01127fad
......@@ -35,7 +35,6 @@
latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyXPos="-9.219%p"
latin:keyWidth="fillBoth"/>
</Row>
<Row
......@@ -49,7 +48,6 @@
latin:keyboardLayout="@xml/rowkeys_spanish2" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyXPos="-15.704%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
......
java/res/xml-sw768dp/rows_symbols.xml
+ 0
− 2
View file @ 01127fad
......@@ -36,7 +36,6 @@
latin:keyboardLayout="@xml/rowkeys_symbols1" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyXPos="-9.219%p"
latin:keyWidth="fillRight" />
</Row>
<Row
......@@ -50,7 +49,6 @@
latin:keyboardLayout="@xml/rowkeys_symbols2" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyXPos="-15.704%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
......
java/res/xml-sw768dp/rows_symbols_shift.xml
+ 0
− 2
View file @ 01127fad
......@@ -36,7 +36,6 @@
latin:keyboardLayout="@xml/rowkeys_symbols_shift1" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyXPos="-9.219%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
......@@ -50,7 +49,6 @@
latin:keyboardLayout="@xml/rowkeys_symbols_shift2" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyXPos="-15.704%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment