diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/res/values/keypress-vibration-durations.xml | 3 | ||||
| -rw-r--r-- | java/res/xml/method.xml | 4 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/latin/userdictionary/UserDictionarySettings.java | 20 |
3 files changed, 15 insertions, 12 deletions
diff --git a/java/res/values/keypress-vibration-durations.xml b/java/res/values/keypress-vibration-durations.xml index e2f2b56e5..53448c3e1 100644 --- a/java/res/values/keypress-vibration-durations.xml +++ b/java/res/values/keypress-vibration-durations.xml @@ -51,7 +51,8 @@ <!-- HTC One X --> <item>MODEL=HTC One X:MANUFACTURER=HTC,20</item> <!-- HTC One --> - <item>MODEL=HTC One( special edition)?:MANUFACTURER=HTC,15</item> + <item>MODEL=HTC One:MANUFACTURER=HTC,15</item> + <item>MODEL=HTL22:MANUFACTURER=HTC,15</item> <!-- Motorola Razor M --> <item>MODEL=XT907:MANUFACTURER=motorola,30</item> <!-- Sony Xperia Z --> diff --git a/java/res/xml/method.xml b/java/res/xml/method.xml index 20b8def4a..8710946f4 100644 --- a/java/res/xml/method.xml +++ b/java/res/xml/method.xml @@ -52,7 +52,7 @@ it: Italian/qwerty iw: Hebrew/hebrew # "he" is official language code of Hebrew. ka: Georgian/georgian - kk: Kazakh/east_slavic + (kk: Kazakh/east_slavic) # disabled temporarily. waiting for strnig resources. ky: Kyrgyz/east_slavic lt: Lithuanian/qwerty lv: Latvian/qwerty @@ -303,6 +303,7 @@ android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="KeyboardLayoutSet=georgian" /> + <!-- <subtype android:icon="@drawable/ic_subtype_keyboard" android:label="@string/subtype_generic" android:subtypeId="0x2d73d2f6" @@ -310,6 +311,7 @@ android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="KeyboardLayoutSet=east_slavic" /> + --> <subtype android:icon="@drawable/ic_subtype_keyboard" android:label="@string/subtype_generic" android:subtypeId="0x2e391c04" diff --git a/java/src/com/android/inputmethod/latin/userdictionary/UserDictionarySettings.java b/java/src/com/android/inputmethod/latin/userdictionary/UserDictionarySettings.java index 50dda9663..64f860e7d 100644 --- a/java/src/com/android/inputmethod/latin/userdictionary/UserDictionarySettings.java +++ b/java/src/com/android/inputmethod/latin/userdictionary/UserDictionarySettings.java @@ -1,17 +1,17 @@ -/** - * Copyright (C) 2013 Google Inc. +/* + * Copyright (C) 2013 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 + * 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 + * 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. + * 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. */ package com.android.inputmethod.latin.userdictionary; |