| commit | 9d313c6ce96bbf47db7651445031793765094d7e | [log] [tgz] |
|---|---|---|
| author | Jean Chalard <jchalard@google.com> | Wed Jul 24 08:39:00 2013 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Jul 24 08:39:00 2013 +0000 |
| tree | 64ce6e76057dccba6f6093df87f8af73e5498394 | |
| parent | 2c479e783b86b3776cc6d5e9d9a71068b95b6947 [diff] | |
| parent | 429db8d61e608d5330345412a1e014383a5d2886 [diff] |
Merge "[FD3] Split stackNodes into two methods."
diff --git a/dictionaries/en_GB_wordlist.combined.gz b/dictionaries/en_GB_wordlist.combined.gz index 5e2a9df..ff78db7 100644 --- a/dictionaries/en_GB_wordlist.combined.gz +++ b/dictionaries/en_GB_wordlist.combined.gz Binary files differ
diff --git a/dictionaries/en_US_wordlist.combined.gz b/dictionaries/en_US_wordlist.combined.gz index 33ef1c1..4edc967 100644 --- a/dictionaries/en_US_wordlist.combined.gz +++ b/dictionaries/en_US_wordlist.combined.gz Binary files differ
diff --git a/dictionaries/en_wordlist.combined.gz b/dictionaries/en_wordlist.combined.gz index c39f052..95a7369 100644 --- a/dictionaries/en_wordlist.combined.gz +++ b/dictionaries/en_wordlist.combined.gz Binary files differ
diff --git a/dictionaries/fr_wordlist.combined.gz b/dictionaries/fr_wordlist.combined.gz index 4b55261..0763b62 100644 --- a/dictionaries/fr_wordlist.combined.gz +++ b/dictionaries/fr_wordlist.combined.gz Binary files differ
diff --git a/dictionaries/pt_BR_wordlist.combined.gz b/dictionaries/pt_BR_wordlist.combined.gz index 83dbe79..0dd8472 100644 --- a/dictionaries/pt_BR_wordlist.combined.gz +++ b/dictionaries/pt_BR_wordlist.combined.gz Binary files differ
diff --git a/java/res/raw/main_en.dict b/java/res/raw/main_en.dict index 120e19b..3a41257 100644 --- a/java/res/raw/main_en.dict +++ b/java/res/raw/main_en.dict Binary files differ
diff --git a/java/res/raw/main_fr.dict b/java/res/raw/main_fr.dict index fb43a1a..31fb2af 100644 --- a/java/res/raw/main_fr.dict +++ b/java/res/raw/main_fr.dict Binary files differ
diff --git a/java/res/raw/main_pt_br.dict b/java/res/raw/main_pt_br.dict index 8c14499..557d46e 100644 --- a/java/res/raw/main_pt_br.dict +++ b/java/res/raw/main_pt_br.dict Binary files differ
diff --git a/java/res/xml/method.xml b/java/res/xml/method.xml index 8710946..52d715a 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 strnig resources. be: Belarusian/east_slavic bg: Bulgarian/bulgarian bg: Bulgarian/bulgarian_bds @@ -117,13 +117,15 @@ android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="SupportTouchPositionCorrection" /> + <!-- <subtype android:icon="@drawable/ic_subtype_keyboard" android:label="@string/subtype_generic" - android:subtypeId="0x2a362219" + android:subtypeId="0x70b0f974" android:imeSubtypeLocale="az" android:imeSubtypeMode="keyboard" - android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection" + android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable" /> + --> <subtype android:icon="@drawable/ic_subtype_keyboard" android:label="@string/subtype_generic" android:subtypeId="0x1dc3a859"