am 566cded5: Merge "Use kbd_row3_comman_period.xml"
* commit '566cded5e75bbb0250009183c79f14c23b3a6bb6': Use kbd_row3_comman_period.xmlmain
commit
ff5b05487a
|
@ -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>
|
||||||
|
|
|
@ -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" />
|
||||||
|
|
|
@ -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>
|
||||||
|
|
|
@ -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>
|
||||||
|
|
|
@ -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>
|
|
|
@ -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"
|
||||||
|
|
|
@ -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,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.
|
Loading…
Reference in New Issue