From 3dd33652e461344d4c8a2ca5069b832c47aacdfd Mon Sep 17 00:00:00 2001
From: Satoshi Kataoka <satok@google.com>
Date: Wed, 16 Oct 2013 14:39:49 +0900
Subject: [PATCH] Do not merge. Remove Azerbaijani subtype
The corresponding change is I0d2a98dffe03ebd
Bug: 11244796
Change-Id: I0d2a98dffe03ebddf26fc3c2760061c39de4c57e
---
java/res/xml/method.xml | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/java/res/xml/method.xml b/java/res/xml/method.xml
index f0e04c2205..cef2451e2c 100644
--- a/java/res/xml/method.xml
+++ b/java/res/xml/method.xml
@@ -24,7 +24,7 @@
keyboard_locale: script_name/keyboard_layout_set
af: Afrikaans/qwerty
ar: Arabic/arabic
- az: Azerbaijani/qwerty
+ (az: Azerbaijani/qwerty) # disabled temporarily. waiting for string resources.
be: Belarusian/east_slavic
bg: Bulgarian/bulgarian
bg: Bulgarian/bulgarian_bds
@@ -53,7 +53,7 @@
it: Italian/qwerty
iw: Hebrew/hebrew # "he" is official language code of Hebrew.
ka: Georgian/georgian
- (kk: Kazakh/east_slavic) # disabled temporarily. waiting for strnig resources.
+ (kk: Kazakh/east_slavic) # disabled temporarily. waiting for string resources.
km: Khmer/khmer
ky: Kyrgyz/east_slavic
lo: Lao/lao
@@ -63,8 +63,8 @@
mn: Mongolian/mongolian
ms: Malay/qwerty
nb: Norwegian Bokmål/nordic
- ne: Nepali Romanized/nepali_romanized # disabled temporarily
- ne: Nepali Traditional/nepali_traditional # disabled temporarily
+ (ne: Nepali Romanized/nepali_romanized) # disabled temporarily
+ (ne: Nepali Traditional/nepali_traditional) # disabled temporarily
nl: Dutch/qwerty
nl_BE: Dutch Belgium/azerty
pl: Polish/qwerty
@@ -123,6 +123,7 @@
android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="SupportTouchPositionCorrection,EmojiCapable"
/>
+ <!--
<subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_generic"
android:subtypeId="0x70b0f974"
@@ -130,6 +131,7 @@
android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EmojiCapable"
/>
+ -->
<subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_generic"
android:subtypeId="0x1dc3a859"
--
GitLab