am 5748a7ce: Merge "Split Portuguese subtype into pt_BR and pt_PT" into jb-dev

* commit '5748a7ce86631eaff417828984d25eec7dd63c08':
  Split Portuguese subtype into pt_BR and pt_PT
main
Tadashi G. Takaoka 2012-05-17 02:09:02 -07:00 committed by Android Git Automerger
commit e7c7852cbf
1 changed files with 9 additions and 2 deletions

View File

@ -52,7 +52,8 @@
nb: Norwaian Bokmål/nordic nb: Norwaian Bokmål/nordic
nl: Dutch/qwerty nl: Dutch/qwerty
pl: Polish/qwerty pl: Polish/qwerty
pt: Portuguese/qwerty pt_BR: Portuguese Brazil/qwerty
pt_PT: Portuguese Portugal/qwerty
ro: Romanian/qwerty ro: Romanian/qwerty
ru: Russian/east_slavic ru: Russian/east_slavic
sk: Slovak/qwerty sk: Slovak/qwerty
@ -254,7 +255,13 @@
/> />
<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:imeSubtypeLocale="pt" android:imeSubtypeLocale="pt_BR"
android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable"
/>
<subtype android:icon="@drawable/ic_subtype_keyboard"
android:label="@string/subtype_generic"
android:imeSubtypeLocale="pt_PT"
android:imeSubtypeMode="keyboard" android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable" android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable"
/> />