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

am 08d7f2f9: resolved conflicts for merge of b1fbd696 to jb-mr1-dev bug:6809603 

* commit '08d7f2f95ad2240d45d89883fce434c5d5110602':
  nl-rBE keyboard layout
main
Ken Wakasa 2012-09-21 09:54:42 -07:00 committed by Android Git Automerger
parent 9742238da4 08d7f2f95a
commit 40a060bcda
2 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
java/res/values-nl-rBE/bools.xml Normal file
View File

@ -0,0 +1,22 @@
<?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.
*/
-->
<resources>
<bool name="im_is_default">true</bool>
</resources>

7
java/res/xml/method.xml
View File

@ -56,6 +56,7 @@
ms: Malay/qwerty ms: Malay/qwerty
nb: Norwegian Bokmål/nordic nb: Norwegian Bokmål/nordic
nl: Dutch/qwerty nl: Dutch/qwerty
nl_BE: Dutch Belgium/azerty
pl: Polish/qwerty pl: Polish/qwerty
pt_BR: Portuguese Brazil/qwerty pt_BR: Portuguese Brazil/qwerty
pt_PT: Portuguese Portugal/qwerty pt_PT: Portuguese Portugal/qwerty
@ -323,6 +324,12 @@
android:imeSubtypeMode="keyboard" android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection" android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection"
/> />
<subtype android:icon="@drawable/ic_subtype_keyboard"
android:label="@string/subtype_generic"
android:imeSubtypeLocale="nl_BE"
android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=azerty,AsciiCapable"
/>
<subtype android:icon="@drawable/ic_subtype_keyboard" <subtype android:icon="@drawable/ic_subtype_keyboard"
android:label="@string/subtype_generic" android:label="@string/subtype_generic"
android:subtypeId="1124698716" android:subtypeId="1124698716"