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

am 566cded5: Merge "Use kbd_row3_comman_period.xml" 

* commit '566cded5e75bbb0250009183c79f14c23b3a6bb6':
  Use kbd_row3_comman_period.xml
main
Tadashi G. Takaoka 2012-01-27 04:23:51 -08:00 committed by Android Git Automerger
parent a0d7008876 566cded5e7
commit ff5b05487a
8 changed files with 13 additions and 179 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
java/res/xml-sw600dp/kbd_rows_azerty.xml
View File

@ -120,28 +120,8 @@
latin:moreKeys="@string/more_keys_for_n" /> latin:moreKeys="@string/more_keys_for_n" />
<Key <Key
latin:keyLabel="\'" /> latin:keyLabel="\'" />
<switch> <include
<case latin:keyboardLayout="@xml/kbd_row3_comma_period" />
latin:mode="email"
>
<Key
latin:keyLabel="," />
<Key
latin:keyLabel="." />
</case>
<default>
<Key
latin:keyLabel=","
latin:keyLabelFlags="hasUppercaseLetter"
latin:keyHintLabel="!"
latin:moreKeys="!" />
<Key
latin:keyLabel="."
latin:keyLabelFlags="hasUppercaseLetter"
latin:keyHintLabel="\?"
latin:moreKeys="\?" />
</default>
</switch>
<include <include
latin:keyboardLayout="@xml/kbd_row3_smiley" /> latin:keyboardLayout="@xml/kbd_row3_smiley" />
</Row> </Row>

24
java/res/xml-sw600dp/kbd_rows_bulgarian.xml
View File

@ -105,28 +105,8 @@
latin:keyLabel="м" /> latin:keyLabel="м" />
<Key <Key
latin:keyLabel="ю" /> latin:keyLabel="ю" />
<switch> <include
<case latin:keyboardLayout="@xml/kbd_row3_comma_period" />
latin:mode="email"
>
<Key
latin:keyLabel="," />
<Key
latin:keyLabel="." />
</case>
<default>
<Key
latin:keyLabel=","
latin:keyLabelFlags="hasUppercaseLetter"
latin:keyHintLabel="!"
latin:moreKeys="!" />
<Key
latin:keyLabel="."
latin:keyLabelFlags="hasUppercaseLetter"
latin:keyHintLabel="\?"
latin:moreKeys="\?" />
</default>
</switch>
<Spacer <Spacer
latin:keyXPos="-10.000%p" latin:keyXPos="-10.000%p"
latin:keyWidth="0%p" /> latin:keyWidth="0%p" />

24
java/res/xml-sw600dp/kbd_rows_qwertz.xml
View File

@ -87,28 +87,8 @@
latin:moreKeys="@string/more_keys_for_n" /> latin:moreKeys="@string/more_keys_for_n" />
<Key <Key
latin:keyLabel="m" /> latin:keyLabel="m" />
<switch> <include
<case latin:keyboardLayout="@xml/kbd_row3_comma_period" />
latin:mode="email"
>
<Key
latin:keyLabel="," />
<Key
latin:keyLabel="." />
</case>
<default>
<Key
latin:keyLabel=","
latin:keyLabelFlags="hasUppercaseLetter"
latin:keyHintLabel="!"
latin:moreKeys="!" />
<Key
latin:keyLabel="."
latin:keyLabelFlags="hasUppercaseLetter"
latin:keyHintLabel="\?"
latin:moreKeys="\?" />
</default>
</switch>
<include <include
latin:keyboardLayout="@xml/kbd_row3_smiley" /> latin:keyboardLayout="@xml/kbd_row3_smiley" />
</Row> </Row>

24
java/res/xml-sw600dp/kbd_rows_slavic.xml
View File

@ -114,28 +114,8 @@
latin:keyLabel="б" /> latin:keyLabel="б" />
<Key <Key
latin:keyLabel="ю" /> latin:keyLabel="ю" />
<switch> <include
<case latin:keyboardLayout="@xml/kbd_row3_comma_period" />
latin:mode="email"
>
<Key
latin:keyLabel="," />
<Key
latin:keyLabel="." />
</case>
<default>
<Key
latin:keyLabel=","
latin:keyLabelFlags="hasUppercaseLetter"
latin:keyHintLabel="!"
latin:moreKeys="!" />
<Key
latin:keyLabel="."
latin:keyLabelFlags="hasUppercaseLetter"
latin:keyHintLabel="\?"
latin:moreKeys="\?" />
</default>
</switch>
<include <include
latin:keyboardLayout="@xml/kbd_row3_smiley" /> latin:keyboardLayout="@xml/kbd_row3_smiley" />
</Row> </Row>

46
java/res/xml-sw768dp/kbd_row3_comma_period.xml
View File

@ -1,46 +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"
>
<switch>
<case
latin:mode="email"
>
<Key
latin:keyLabel="," />
<Key
latin:keyLabel="." />
</case>
<default>
<Key
latin:keyLabel=","
latin:keyLabelFlags="hasUppercaseLetter"
latin:keyHintLabel="!"
latin:moreKeys="!" />
<Key
latin:keyLabel="."
latin:keyLabelFlags="hasUppercaseLetter"
latin:keyHintLabel="\?"
latin:moreKeys="\?" />
</default>
</switch>
</merge>

24
java/res/xml-sw768dp/kbd_rows_azerty.xml
View File

@ -130,28 +130,8 @@
latin:keyLabelFlags="hasUppercaseLetter" latin:keyLabelFlags="hasUppercaseLetter"
latin:keyHintLabel=":" latin:keyHintLabel=":"
latin:moreKeys=":" /> latin:moreKeys=":" />
<switch> <include
<case latin:keyboardLayout="@xml/kbd_row3_comma_period" />
latin:mode="email"
>
<Key
latin:keyLabel="," />
<Key
latin:keyLabel="." />
</case>
<default>
<Key
latin:keyLabel=","
latin:keyLabelFlags="hasUppercaseLetter"
latin:keyHintLabel="!"
latin:moreKeys="!" />
<Key
latin:keyLabel="."
latin:keyLabelFlags="hasUppercaseLetter"
latin:keyHintLabel="\?"
latin:moreKeys="\?" />
</default>
</switch>
<Key <Key
latin:keyStyle="shiftKeyStyle" latin:keyStyle="shiftKeyStyle"
latin:keyXPos="-13.750%p" latin:keyXPos="-13.750%p"

24
java/res/xml-sw768dp/kbd_rows_qwertz.xml
View File

@ -91,28 +91,8 @@
latin:moreKeys="@string/more_keys_for_n" /> latin:moreKeys="@string/more_keys_for_n" />
<Key <Key
latin:keyLabel="m" /> latin:keyLabel="m" />
<switch> <include
<case latin:keyboardLayout="@xml/kbd_row3_comma_period" />
latin:mode="email"
>
<Key
latin:keyLabel="," />
<Key
latin:keyLabel="." />
</case>
<default>
<Key
latin:keyLabel=","
latin:keyLabelFlags="hasUppercaseLetter"
latin:keyHintLabel="!"
latin:moreKeys="!" />
<Key
latin:keyLabel="."
latin:keyLabelFlags="hasUppercaseLetter"
latin:keyHintLabel="\?"
latin:moreKeys="\?" />
</default>
</switch>
<Key <Key
latin:keyStyle="shiftKeyStyle" latin:keyStyle="shiftKeyStyle"
latin:keyXPos="-13.750%p" latin:keyXPos="-13.750%p"

2
java/res/xml-sw600dp/kbd_row3_comma_period.xml → java/res/xml/kbd_row3_comma_period.xml
View File

@ -2,7 +2,7 @@
<!-- <!--
/* /*
** **
** Copyright 2011, The Android Open Source Project ** Copyright 2012, The Android Open Source Project
** **
** Licensed under the Apache License, Version 2.0 (the "License"); ** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License. ** you may not use this file except in compliance with the License.