diff options
| author |   Ken Wakasa <kwakasa@google.com> | 2012-09-22 01:50:33 +0900 |
|---|---|---|
| committer | Ken Wakasa <kwakasa@google.com> | 2012-09-22 01:50:33 +0900 |
| commit | 08d7f2f95ad2240d45d89883fce434c5d5110602 (patch) | |
| tree | 9ac2bf35bc2372dcfe9a4ca46cf6c0d4e935d36e /java | |
| parent | c613f1e7ab44aa99296c42fb022bfb28b47f2c75 (diff) | |
| parent | b1fbd696de3f34696b9ce2dd7fb481abd0de8c3b (diff) | |
| download | latinime-08d7f2f95ad2240d45d89883fce434c5d5110602.tar.gz latinime-08d7f2f95ad2240d45d89883fce434c5d5110602.tar.xz latinime-08d7f2f95ad2240d45d89883fce434c5d5110602.zip | |
resolved conflicts for merge of b1fbd696 to jb-mr1-dev bug:6809603
Change-Id: I23dcf45892d94db88f424a4ee0ae440a2c743d9b
Diffstat (limited to 'java')
| -rw-r--r-- | java/res/values-nl-rBE/bools.xml | 22 | ||||
| -rw-r--r-- | java/res/xml/method.xml | 7 |
2 files changed, 29 insertions, 0 deletions
diff --git a/java/res/values-nl-rBE/bools.xml b/java/res/values-nl-rBE/bools.xml new file mode 100644 index 000000000..ad833975e --- /dev/null +++ b/java/res/values-nl-rBE/bools.xml @@ -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> diff --git a/java/res/xml/method.xml b/java/res/xml/method.xml index 7a8c6a9ba..83eafd038 100644 --- a/java/res/xml/method.xml +++ b/java/res/xml/method.xml @@ -56,6 +56,7 @@ ms: Malay/qwerty nb: Norwegian Bokmål/nordic nl: Dutch/qwerty + nl_BE: Dutch Belgium/azerty pl: Polish/qwerty pt_BR: Portuguese Brazil/qwerty pt_PT: Portuguese Portugal/qwerty @@ -325,6 +326,12 @@ /> <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" + android:label="@string/subtype_generic" android:subtypeId="1124698716" android:imeSubtypeLocale="pl" android:imeSubtypeMode="keyboard" |