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

am 937c40ee: Merge "Fix AZERTY/tablet layout" 

* commit '937c40ee00f388e762a6ac856210c3ea648d9bb5':
  Fix AZERTY/tablet layout
main
Tadashi G. Takaoka 2014-03-06 21:34:42 -08:00 committed by Android Git Automerger
parent d5aa36505f 937c40ee00
commit a2293ec906
3 changed files with 13 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
java/res/xml-sw600dp/key_azerty3_right.xml
View File

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

37
java/res/xml/key_azerty3_right.xml
View File

@ -1,37 +0,0 @@
<?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|alphabetShiftLockShifted"
>
<Key
latin:keySpec="\?" />
</case>
<default>
<Key
latin:keySpec="\'"
latin:moreKeys="!text/more_keys_for_single_quote" />
</default>
</switch>
</merge>

15
java/res/xml/rowkeys_azerty3.xml
View File

@ -37,6 +37,17 @@
<Key <Key
latin:keySpec="n" latin:keySpec="n"
latin:moreKeys="!text/more_keys_for_n" /> latin:moreKeys="!text/more_keys_for_n" />
<include <switch>
latin:keyboardLayout="@xml/key_azerty3_right" /> <case
latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLockShifted"
>
<Key
latin:keySpec="\?" />
</case>
<default>
<Key
latin:keySpec="\'"
latin:moreKeys="!text/more_keys_for_single_quote" />
</default>
</switch>
</merge> </merge>