am 9d802202: Merge "Temporarily disabled Azerbaijani subtype"

* commit '9d802202d73592ed18f2fe7835eff6156497e39d':
  Temporarily disabled Azerbaijani subtype
main
Tadashi G. Takaoka 2013-07-23 23:41:52 -07:00 committed by Android Git Automerger
commit 470cd988a4
1 changed files with 5 additions and 3 deletions

View File

@ -24,7 +24,7 @@
keyboard_locale: script_name/keyboard_layout_set keyboard_locale: script_name/keyboard_layout_set
af: Afrikaans/qwerty af: Afrikaans/qwerty
ar: Arabic/arabic ar: Arabic/arabic
az: Azerbaijani/qwerty (az: Azerbaijani/qwerty) # disabled temporarily. waiting for strnig resources.
be: Belarusian/east_slavic be: Belarusian/east_slavic
bg: Bulgarian/bulgarian bg: Bulgarian/bulgarian
bg: Bulgarian/bulgarian_bds bg: Bulgarian/bulgarian_bds
@ -117,13 +117,15 @@
android:imeSubtypeMode="keyboard" android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="SupportTouchPositionCorrection" android:imeSubtypeExtraValue="SupportTouchPositionCorrection"
/> />
<!--
<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="0x2a362219" android:subtypeId="0x70b0f974"
android:imeSubtypeLocale="az" android:imeSubtypeLocale="az"
android:imeSubtypeMode="keyboard" android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection" android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,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="0x1dc3a859" android:subtypeId="0x1dc3a859"