nyancrimew/LatinIME
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Support Dvorak layout

Browse source 
Bug: 4460018
Change-Id: I08a9b556720f6c4f7089a8838c0869c9f88f479c
This commit is contained in:
Tadashi G. Takaoka 2012-04-19 20:16:35 +09:00
parent 25b5e627d8
commit 78173bdf53
18 changed files with 802 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
java/res/values/donottranslate.xml
View file

@ -152,6 +152,8 @@
<string name="subtype_generic_qwertz">%s (QWERTZ)</string>
<!-- Description for generic AZERTY keyboard subtype -->
<string name="subtype_generic_azerty">%s (AZERTY)</string>
<!-- Description for generic Dvorak keyboard subtype -->
<string name="subtype_generic_dvorak">%s (Dvorak)</string>
<!-- dictionary pack package name /settings activity (for shared prefs and settings) -->
<string name="dictionary_pack_package_name">com.google.android.inputmethod.latin.dictionarypack</string>

48
java/res/xml-sw600dp/key_question_exclamation.xml Normal file
View file

@ -0,0 +1,48 @@
<?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.
*/
-->
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<switch>
<case
latin:mode="email"
>
<Key
latin:keyLabel="-" />
</case>
<case
latin:mode="url"
>
<Key
latin:keyLabel="/"
latin:keyHintLabel=":"
latin:moreKeys=":"
latin:keyStyle="hasShiftedLetterHintStyle" />
</case>
<default>
<Key
latin:keyLabel="\?"
latin:keyHintLabel="!"
latin:moreKeys="!"
latin:keyStyle="hasShiftedLetterHintStyle" />
</default>
</switch>
</merge>

40
java/res/xml-sw600dp/keys_dvorak_123.xml Normal file
View file

@ -0,0 +1,40 @@
<?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.
*/
-->
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<Key
latin:keyLabel="\'"
latin:keyHintLabel="&quot;"
latin:moreKeys="!"
latin:keyStyle="hasShiftedLetterHintStyle" />
<Key
latin:keyLabel=","
latin:keyHintLabel="&lt;"
latin:moreKeys="\?"
latin:keyStyle="hasShiftedLetterHintStyle" />
<Key
latin:keyLabel="."
latin:keyHintLabel="&gt;"
latin:keyLabelFlags="hasPopupHint|preserveCase"
latin:moreKeys="!text/more_keys_for_punctuation"
latin:keyStyle="hasShiftedLetterHintStyle" />
</merge>

46
java/res/xml-sw600dp/row_dvorak4.xml Normal file
View file

@ -0,0 +1,46 @@
<?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.
*/
-->
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<Row
latin:keyWidth="8.9%p"
>
<Key
latin:keyStyle="toSymbolKeyStyle"
latin:keyWidth="13.0%p" />
<Key
latin:keyStyle="tabKeyStyle" />
<include
latin:keyboardLayout="@xml/key_f1" />
<include
latin:keyboardLayout="@xml/key_space" />
<include
latin:keyboardLayout="@xml/key_question_exclamation" />
<include
latin:keyboardLayout="@xml/key_dash" />
<Spacer
latin:keyXPos="-10.00%p"
latin:keyWidth="0%p" />
<include
latin:keyboardLayout="@xml/key_shortcut" />
</Row>
</merge>

47
java/res/xml-sw600dp/rowkeys_dvorak3.xml Normal file
View file

@ -0,0 +1,47 @@
<?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.
*/
-->
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<Key
latin:keyLabel="q" />
<Key
latin:keyLabel="j"
latin:moreKeys="!text/more_keys_for_j" />
<Key
latin:keyLabel="k"
latin:moreKeys="!text/more_keys_for_k" />
<Key
latin:keyLabel="x" />
<Key
latin:keyLabel="b" />
<Key
latin:keyLabel="m" />
<Key
latin:keyLabel="w"
latin:moreKeys="!text/more_keys_for_w" />
<Key
latin:keyLabel="v"
latin:moreKeys="!text/more_keys_for_v" />
<Key
latin:keyLabel="z"
latin:moreKeys="!text/more_keys_for_z" />
</merge>

63
java/res/xml-sw600dp/rows_dvorak.xml Normal file
View file

@ -0,0 +1,63 @@
<?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.
*/
-->
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
latin:keyboardLayout="@xml/key_styles_common" />
<Row
latin:keyWidth="8.5%p"
>
<include
latin:keyboardLayout="@xml/keys_dvorak_123" />
<include
latin:keyboardLayout="@xml/rowkeys_dvorak1"
latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillBoth" />
</Row>
<Row
latin:keyWidth="8.5%p"
>
<include
latin:keyboardLayout="@xml/rowkeys_dvorak2"
latin:keyXPos="4.5%p" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyWidth="fillBoth" />
</Row>
<Row
latin:keyWidth="8.5%p"
>
<Key
latin:keyStyle="shiftKeyStyle"
latin:keyWidth="10.0%p" />
<include
latin:keyboardLayout="@xml/rowkeys_dvorak3" />
<include
latin:keyboardLayout="@xml/key_smiley"
latin:keyXPos="-8.5%p"
latin:keyWidth="fillRight" />
</Row>
<include
latin:keyboardLayout="@xml/row_dvorak4" />
</merge>

51
java/res/xml-sw768dp/row_dvorak4.xml Normal file
View file

@ -0,0 +1,51 @@
<?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.
*/
-->
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<Row
latin:keyWidth="8.047%p"
>
<include
latin:keyboardLayout="@xml/key_settings" />
<Spacer
latin:keyXPos="15.157%p"
latin:keyWidth="0%p" />
<include
latin:keyboardLayout="@xml/keys_f1f2" />
<include
latin:keyboardLayout="@xml/key_space" />
<include
latin:keyboardLayout="@xml/key_question_exclamation" />
<include
latin:keyboardLayout="@xml/key_dash" />
<switch>
<case
latin:shortcutKeyEnabled="true"
>
<Key
latin:keyStyle="shortcutKeyStyle"
latin:keyXPos="-8.047%p"
latin:keyWidth="fillRight" />
</case>
</switch>
</Row>
</merge>

69
java/res/xml-sw768dp/rows_dvorak.xml Normal file
View file

@ -0,0 +1,69 @@
<?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.
*/
-->
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
latin:keyboardLayout="@xml/key_styles_common" />
<Row
latin:keyWidth="8.282%p"
>
<Key
latin:keyStyle="tabKeyStyle"
latin:keyLabelFlags="alignLeft"
latin:keyWidth="7.969%p" />
<include
latin:keyboardLayout="@xml/keys_dvorak_123" />
<include
latin:keyboardLayout="@xml/rowkeys_dvorak1"
latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillBoth" />
</Row>
<Row
latin:keyWidth="8.125%p"
>
<Key
latin:keyStyle="toSymbolKeyStyle"
latin:keyLabelFlags="alignLeft"
latin:keyWidth="10.167%p" />
<include
latin:keyboardLayout="@xml/rowkeys_dvorak2" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyWidth="fillBoth" />
</Row>
<Row
latin:keyWidth="8.047%p"
>
<Key
latin:keyStyle="shiftKeyStyle"
latin:keyWidth="13.829%p" />
<include
latin:keyboardLayout="@xml/rowkeys_dvorak3" />
<Key
latin:keyStyle="shiftKeyStyle"
latin:keyWidth="fillBoth" />
</Row>
<include
latin:keyboardLayout="@xml/row_dvorak4" />
</merge>

26
java/res/xml/kbd_dvorak.xml Normal file
View file

@ -0,0 +1,26 @@
<?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_dvorak" />
</Keyboard>

42
java/res/xml/keyboard_layout_set_dvorak.xml Normal file
View file

@ -0,0 +1,42 @@
<?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.
*/
-->
<KeyboardLayoutSet
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
<Element
latin:elementName="alphabet"
latin:elementKeyboard="@xml/kbd_dvorak"
latin:enableProximityCharsCorrection="true" />
<Element
latin:elementName="symbols"
latin:elementKeyboard="@xml/kbd_10_10_7_symbols" />
<Element
latin:elementName="symbolsShifted"
latin:elementKeyboard="@xml/kbd_10_10_7_symbols_shift" />
<Element
latin:elementName="phone"
latin:elementKeyboard="@xml/kbd_phone" />
<Element
latin:elementName="phoneSymbols"
latin:elementKeyboard="@xml/kbd_phone_symbols" />
<Element
latin:elementName="number"
latin:elementKeyboard="@xml/kbd_number" />
</KeyboardLayoutSet>

60
java/res/xml/keys_dvorak_123.xml Normal file
View file

@ -0,0 +1,60 @@
<?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.
*/
-->
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<switch>
<case
latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
>
<Key
latin:keyLabel="&quot;"
latin:keyHintLabel="1"
latin:additionalMoreKeys="1" />
<Key
latin:keyLabel="&lt;"
latin:keyHintLabel="2"
latin:additionalMoreKeys="2" />
<Key
latin:keyLabel="&gt;"
latin:keyHintLabel="3"
latin:additionalMoreKeys="3" />
</case>
<default>
<Key
latin:keyLabel="\'"
latin:keyHintLabel="1"
latin:additionalMoreKeys="1"
latin:moreKeys="!" />
<Key
latin:keyLabel=","
latin:keyHintLabel="2"
latin:additionalMoreKeys="2"
latin:moreKeys="\?" />
<Key
latin:keyLabel="."
latin:keyHintLabel="3"
latin:additionalMoreKeys="3"
latin:keyLabelFlags="hasPopupHint|preserveCase"
latin:moreKeys="!text/more_keys_for_punctuation,%" />
</default>
</switch>
</merge>

89
java/res/xml/row_dvorak4.xml Normal file
View file

@ -0,0 +1,89 @@
<?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.
*/
-->
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<Row
latin:keyWidth="10%p"
>
<Key
latin:keyStyle="toSymbolKeyStyle"
latin:keyWidth="15%p" />
<switch>
<case
latin:mode="url"
>
<Key
latin:keyLabel="/"
latin:keyStyle="f1MoreKeysStyle" />
</case>
<case
latin:mode="email"
>
<Key
latin:keyLabel="\@"
latin:keyStyle="f1MoreKeysStyle" />
</case>
<case
latin:hasShortcutKey="true"
latin:keyboardLayoutSetElement="alphabet"
>
<Key
latin:keyLabel="q"
latin:backgroundType="normal"
latin:additionalMoreKeys="!text/shortcut_as_more_key"
latin:keyStyle="f1MoreKeysStyle" />
</case>
<case
latin:hasShortcutKey="true"
>
<Key
latin:keyLabel="Q"
latin:backgroundType="normal"
latin:additionalMoreKeys="!text/shortcut_as_more_key"
latin:keyStyle="f1MoreKeysStyle" />
</case>
<!-- latin:hasShortcutKey="false" -->
<case
latin:keyboardLayoutSetElement="alphabet"
>
<Key
latin:keyLabel="q"
latin:backgroundType="normal"
latin:keyStyle="f1MoreKeysStyle" />
</case>
<default>
<Key
latin:keyLabel="Q"
latin:backgroundType="normal"
latin:keyStyle="f1MoreKeysStyle" />
</default>
</switch>
<include
latin:keyboardLayout="@xml/key_space" />
<Key
latin:keyLabel="z"
latin:moreKeys="!text/more_keys_for_z" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyWidth="fillRight" />
</Row>
</merge>

57
java/res/xml/rowkeys_dvorak1.xml Normal file
View file

@ -0,0 +1,57 @@
<?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.
*/
-->
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<Key
latin:keyLabel="p"
latin:keyHintLabel="4"
latin:additionalMoreKeys="4" />
<Key
latin:keyLabel="y"
latin:keyHintLabel="5"
latin:additionalMoreKeys="5"
latin:moreKeys="!text/more_keys_for_y" />
<Key
latin:keyLabel="f"
latin:keyHintLabel="6"
latin:additionalMoreKeys="6" />
<Key
latin:keyLabel="g"
latin:keyHintLabel="7"
latin:additionalMoreKeys="7"
latin:moreKeys="!text/more_keys_for_g" />
<Key
latin:keyLabel="c"
latin:keyHintLabel="8"
latin:additionalMoreKeys="8"
latin:moreKeys="!text/more_keys_for_c" />
<Key
latin:keyLabel="r"
latin:keyHintLabel="9"
latin:additionalMoreKeys="9"
latin:moreKeys="!text/more_keys_for_r" />
<Key
latin:keyLabel="l"
latin:keyHintLabel="0"
latin:additionalMoreKeys="0"
latin:moreKeys="!text/more_keys_for_l" />
</merge>

54
java/res/xml/rowkeys_dvorak2.xml Normal file
View file

@ -0,0 +1,54 @@
<?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.
*/
-->
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<Key
latin:keyLabel="a"
latin:moreKeys="!text/more_keys_for_a" />
<Key
latin:keyLabel="o"
latin:moreKeys="!text/more_keys_for_o" />
<Key
latin:keyLabel="e"
latin:moreKeys="!text/more_keys_for_e" />
<Key
latin:keyLabel="u"
latin:moreKeys="!text/more_keys_for_u" />
<Key
latin:keyLabel="i"
latin:moreKeys="!text/more_keys_for_i" />
<Key
latin:keyLabel="d"
latin:moreKeys="!text/more_keys_for_d" />
<Key
latin:keyLabel="h"
latin:moreKeys="!text/more_keys_for_h" />
<Key
latin:keyLabel="t"
latin:moreKeys="!text/more_keys_for_t" />
<Key
latin:keyLabel="n"
latin:moreKeys="!text/more_keys_for_n" />
<Key
latin:keyLabel="s"
latin:moreKeys="!text/more_keys_for_s" />
</merge>

42
java/res/xml/rowkeys_dvorak3.xml Normal file
View file

@ -0,0 +1,42 @@
<?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.
*/
-->
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<Key
latin:keyLabel="j"
latin:moreKeys="!text/more_keys_for_j" />
<Key
latin:keyLabel="k"
latin:moreKeys="!text/more_keys_for_k" />
<Key
latin:keyLabel="x" />
<Key
latin:keyLabel="b" />
<Key
latin:keyLabel="m" />
<Key
latin:keyLabel="w"
latin:moreKeys="!text/more_keys_for_w" />
<Key
latin:keyLabel="v"
latin:moreKeys="!text/more_keys_for_v" />
</merge>

56
java/res/xml/rows_dvorak.xml Normal file
View file

@ -0,0 +1,56 @@
<?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.
*/
-->
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
latin:keyboardLayout="@xml/key_styles_common" />
<Row
latin:keyWidth="10%p"
>
<include
latin:keyboardLayout="@xml/keys_dvorak_123" />
<include
latin:keyboardLayout="@xml/rowkeys_dvorak1" />
</Row>
<Row
latin:keyWidth="10%p"
>
<include
latin:keyboardLayout="@xml/rowkeys_dvorak2" />
</Row>
<Row
latin:keyWidth="10%p"
>
<Key
latin:keyStyle="shiftKeyStyle"
latin:keyWidth="15%p"
latin:visualInsetsRight="1%p" />
<include
latin:keyboardLayout="@xml/rowkeys_dvorak3" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight"
latin:visualInsetsLeft="1%p" />
</Row>
<include
latin:keyboardLayout="@xml/row_dvorak4" />
</merge>

5
java/src/com/android/inputmethod/latin/AdditionalSubtype.java
View file

@ -28,10 +28,12 @@ public class AdditionalSubtype {
public static final String QWERTY = "qwerty";
public static final String QWERTZ = "qwertz";
public static final String AZERTY = "azerty";
public static final String DVORAK = "dvorak";
public static final String[] PREDEFINED_KEYBOARD_LAYOUT_SET = {
QWERTY,
QWERTZ,
AZERTY
AZERTY,
DVORAK
};
// Keyboard layout to subtype name resource id map.
@ -42,6 +44,7 @@ public class AdditionalSubtype {
sKeyboardLayoutToNameIdsMap.put(QWERTY, R.string.subtype_generic_qwerty);
sKeyboardLayoutToNameIdsMap.put(QWERTZ, R.string.subtype_generic_qwertz);
sKeyboardLayoutToNameIdsMap.put(AZERTY, R.string.subtype_generic_azerty);
sKeyboardLayoutToNameIdsMap.put(DVORAK, R.string.subtype_generic_dvorak);
}
private AdditionalSubtype() {

7
java/src/com/android/inputmethod/latin/SubtypeLocale.java
View file

@ -115,7 +115,12 @@ public class SubtypeLocale {
}
public static String getKeyboardLayoutSetDisplayName(InputMethodSubtype subtype) {
return getKeyboardLayoutSetName(subtype).toUpperCase();
final String layoutName = getKeyboardLayoutSetName(subtype);
// TODO: This hack should be removed.
if (layoutName.equals(AdditionalSubtype.DVORAK)) {
return StringUtils.toTitleCase(layoutName, Locale.US);
}
return layoutName.toUpperCase();
}
public static String getKeyboardLayoutSetName(InputMethodSubtype subtype) {