Merge "Separate Greek semicolon key from row"

main
Tadashi G. Takaoka 2012-03-11 21:01:53 -07:00 committed by Android (Google) Code Review
commit 2de0c4b754
7 changed files with 78 additions and 24 deletions

View File

@ -0,0 +1,29 @@
<?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=":"
latin:moreKeys=":"
latin:keyStyle="hasShiftedLetterHintStyle" />
</merge>

View File

@ -21,12 +21,7 @@
<merge <merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
> >
<Key <!-- TODO: Should find a way to compound Greek dialytika tonos and other Greek letters. -->
latin:keyLabel=";"
latin:keyHintLabel=":"
latin:moreKeys=":"
latin:keyStyle="hasShiftedLetterHintStyle" />
<!-- TODO: Should find a way to compound Greek dialytika tonos and other Greek letters. -->
<!-- <!--
<switch> <switch>
<case <case

View File

@ -26,6 +26,8 @@
<Row <Row
latin:keyWidth="9.0%p" latin:keyWidth="9.0%p"
> >
<include
latin:keyboardLayout="@xml/key_greek_semicolon" />
<include <include
latin:keyboardLayout="@xml/rowkeys_greek1" /> latin:keyboardLayout="@xml/rowkeys_greek1" />
<Key <Key

View File

@ -30,6 +30,8 @@
latin:keyStyle="tabKeyStyle" latin:keyStyle="tabKeyStyle"
latin:keyLabelFlags="alignLeft" latin:keyLabelFlags="alignLeft"
latin:keyWidth="7.969%p" /> latin:keyWidth="7.969%p" />
<include
latin:keyboardLayout="@xml/key_greek_semicolon" />
<include <include
latin:keyboardLayout="@xml/rowkeys_greek1" /> latin:keyboardLayout="@xml/rowkeys_greek1" />
</Row> </Row>

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"
>
<switch>
<case
latin:keyboardSetElement="alphabetManualShifted|alphabetShiftLockShifted"
>
<Key
latin:keyLabel=":"
latin:keyHintLabel="1"
latin:moreKeys=";"
latin:additionalMoreKeys="1" />
</case>
<default>
<Key
latin:keyLabel=";"
latin:keyHintLabel="1"
latin:moreKeys=":"
latin:additionalMoreKeys="1" />
</default>
</switch>
</merge>

View File

@ -21,24 +21,6 @@
<merge <merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
> >
<switch>
<case
latin:keyboardSetElement="alphabetManualShifted|alphabetShiftLockShifted"
>
<Key
latin:keyLabel=":"
latin:keyHintLabel="1"
latin:moreKeys=";"
latin:additionalMoreKeys="1" />
</case>
<default>
<Key
latin:keyLabel=";"
latin:keyHintLabel="1"
latin:moreKeys=":"
latin:additionalMoreKeys="1" />
</default>
</switch>
<!-- TODO: Should find a way to compound Greek dialytika tonos and other Greek letters. --> <!-- TODO: Should find a way to compound Greek dialytika tonos and other Greek letters. -->
<!-- <!--
<switch> <switch>

View File

@ -26,6 +26,8 @@
<Row <Row
latin:keyWidth="10%p" latin:keyWidth="10%p"
> >
<include
latin:keyboardLayout="@xml/key_greek_semicolon" />
<include <include
latin:keyboardLayout="@xml/rowkeys_greek1" /> latin:keyboardLayout="@xml/rowkeys_greek1" />
</Row> </Row>