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

Merge "Use kbd_row3_comman_period.xml"

parents ab7cb71b 3db07d05
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 13 additions and 179 deletions
java/res/xml-sw600dp/kbd_rows_azerty.xml
+ 2
− 22
View file @ 566cded5
...@@ -120,28 +120,8 @@ ...@@ -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>
......
java/res/xml-sw600dp/kbd_rows_bulgarian.xml
+ 2
− 22
View file @ 566cded5
...@@ -105,28 +105,8 @@ ...@@ -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" />
......
java/res/xml-sw600dp/kbd_rows_qwertz.xml
+ 2
− 22
View file @ 566cded5
...@@ -87,28 +87,8 @@ ...@@ -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>
......
java/res/xml-sw600dp/kbd_rows_slavic.xml
+ 2
− 22
View file @ 566cded5
...@@ -114,28 +114,8 @@ ...@@ -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>
......
java/res/xml-sw768dp/kbd_row3_comma_period.xml deleted 100644 → 0
+ 0
− 46
View file @ ab7cb71b
<?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>
java/res/xml-sw768dp/kbd_rows_azerty.xml
+ 2
− 22
View file @ 566cded5
...@@ -130,28 +130,8 @@ ...@@ -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"
......
java/res/xml-sw768dp/kbd_rows_qwertz.xml
+ 2
− 22
View file @ 566cded5
...@@ -91,28 +91,8 @@ ...@@ -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"
......
java/res/xml-sw600dp/kbd_row3_comma_period.xml → java/res/xml/kbd_row3_comma_period.xml
+ 1
− 1
View file @ 566cded5
...@@ -2,7 +2,7 @@ ...@@ -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.
......
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