Satoshi Kataoka
c68b37964b
Merge remote-tracking branch 'goog/master' into mergescript
...
Conflicts:
CleanSpec.mk
java/Android.mk
java/res/drawable-large-hdpi/btn_keyboard_key_popup_selected_holo.9.png
java/res/drawable-large-hdpi/hint_popup_holo.9.png
java/res/drawable-large-hdpi/sym_keyboard_numsymbol_holo.png
java/res/drawable-large-hdpi/sym_keyboard_tab_holo.png
java/res/drawable-large-land-hdpi/hint_popup_holo.9.png
java/res/drawable-large-land-mdpi/hint_popup_holo.9.png
java/res/drawable-large-land-xhdpi/hint_popup_holo.9.png
java/res/drawable-large-mdpi/btn_keyboard_key_dark_normal_holo.9.png
java/res/drawable-large-mdpi/btn_keyboard_key_dark_normal_off_holo.9.png
java/res/drawable-large-mdpi/btn_keyboard_key_dark_normal_on_holo.9.png
java/res/drawable-large-mdpi/btn_keyboard_key_dark_pressed_holo.9.png
java/res/drawable-large-mdpi/btn_keyboard_key_dark_pressed_off_holo.9.png
java/res/drawable-large-mdpi/btn_keyboard_key_dark_pressed_on_holo.9.png
java/res/drawable-large-mdpi/btn_keyboard_key_light_normal_holo.9.png
java/res/drawable-large-mdpi/btn_keyboard_key_light_pressed_holo.9.png
java/res/drawable-large-mdpi/btn_keyboard_key_popup_selected_holo.9.png
java/res/drawable-large-mdpi/hint_popup_holo.9.png
java/res/drawable-large-mdpi/keyboard_background_holo.9.png
java/res/drawable-large-mdpi/keyboard_popup_panel_background_holo.9.png
java/res/drawable-large-mdpi/keyboard_suggest_strip_holo.9.png
java/res/drawable-large-mdpi/sym_keyboard_delete_holo.png
java/res/drawable-large-mdpi/sym_keyboard_num0_holo.png
java/res/drawable-large-mdpi/sym_keyboard_num1_holo.png
java/res/drawable-large-mdpi/sym_keyboard_num2_holo.png
java/res/drawable-large-mdpi/sym_keyboard_num3_holo.png
java/res/drawable-large-mdpi/sym_keyboard_num4_holo.png
java/res/drawable-large-mdpi/sym_keyboard_num5_holo.png
java/res/drawable-large-mdpi/sym_keyboard_num6_holo.png
java/res/drawable-large-mdpi/sym_keyboard_num7_holo.png
java/res/drawable-large-mdpi/sym_keyboard_num8_holo.png
java/res/drawable-large-mdpi/sym_keyboard_num9_holo.png
java/res/drawable-large-mdpi/sym_keyboard_numbpound_holo.png
java/res/drawable-large-mdpi/sym_keyboard_numbstar_holo.png
java/res/drawable-large-mdpi/sym_keyboard_numsymbol_holo.png
java/res/drawable-large-mdpi/sym_keyboard_return_holo.png
java/res/drawable-large-mdpi/sym_keyboard_settings_holo.png
java/res/drawable-large-mdpi/sym_keyboard_shift_holo.png
java/res/drawable-large-mdpi/sym_keyboard_shift_locked_holo.png
java/res/drawable-large-mdpi/sym_keyboard_space_holo.png
java/res/drawable-large-mdpi/sym_keyboard_tab_holo.png
java/res/drawable-large-mdpi/sym_keyboard_voice_holo.png
java/res/drawable-large-mdpi/sym_keyboard_voice_off_holo.png
java/res/drawable-large-xhdpi/btn_keyboard_key_popup_selected_holo.9.png
java/res/drawable-large-xhdpi/hint_popup_holo.9.png
java/res/drawable-large-xhdpi/sym_keyboard_numsymbol_holo.png
java/res/drawable-large-xhdpi/sym_keyboard_tab_holo.png
java/res/drawable-xlarge-hdpi/btn_keyboard_key_popup_selected_holo.9.png
java/res/drawable-xlarge-hdpi/hint_popup_holo.9.png
java/res/drawable-xlarge-land-hdpi/hint_popup_holo.9.png
java/res/drawable-xlarge-land-mdpi/hint_popup_holo.9.png
java/res/drawable-xlarge-land-xhdpi/hint_popup_holo.9.png
java/res/drawable-xlarge-mdpi/btn_keyboard_key_dark_normal_holo.9.png
java/res/drawable-xlarge-mdpi/btn_keyboard_key_dark_normal_off_holo.9.png
java/res/drawable-xlarge-mdpi/btn_keyboard_key_dark_normal_on_holo.9.png
java/res/drawable-xlarge-mdpi/btn_keyboard_key_dark_pressed_holo.9.png
java/res/drawable-xlarge-mdpi/btn_keyboard_key_dark_pressed_off_holo.9.png
java/res/drawable-xlarge-mdpi/btn_keyboard_key_dark_pressed_on_holo.9.png
java/res/drawable-xlarge-mdpi/btn_keyboard_key_light_normal_holo.9.png
java/res/drawable-xlarge-mdpi/btn_keyboard_key_light_pressed_holo.9.png
java/res/drawable-xlarge-mdpi/btn_keyboard_key_popup_selected_holo.9.png
java/res/drawable-xlarge-mdpi/hint_popup_holo.9.png
java/res/drawable-xlarge-mdpi/keyboard_background_holo.9.png
java/res/drawable-xlarge-mdpi/keyboard_popup_panel_background_holo.9.png
java/res/drawable-xlarge-mdpi/keyboard_suggest_strip_holo.9.png
java/res/drawable-xlarge-mdpi/sym_keyboard_delete_holo.png
java/res/drawable-xlarge-mdpi/sym_keyboard_num0_holo.png
java/res/drawable-xlarge-mdpi/sym_keyboard_num1_holo.png
java/res/drawable-xlarge-mdpi/sym_keyboard_num2_holo.png
java/res/drawable-xlarge-mdpi/sym_keyboard_num3_holo.png
java/res/drawable-xlarge-mdpi/sym_keyboard_num4_holo.png
java/res/drawable-xlarge-mdpi/sym_keyboard_num5_holo.png
java/res/drawable-xlarge-mdpi/sym_keyboard_num6_holo.png
java/res/drawable-xlarge-mdpi/sym_keyboard_num7_holo.png
java/res/drawable-xlarge-mdpi/sym_keyboard_num8_holo.png
java/res/drawable-xlarge-mdpi/sym_keyboard_num9_holo.png
java/res/drawable-xlarge-mdpi/sym_keyboard_numbpound_holo.png
java/res/drawable-xlarge-mdpi/sym_keyboard_numbstar_holo.png
java/res/drawable-xlarge-mdpi/sym_keyboard_return_holo.png
java/res/drawable-xlarge-mdpi/sym_keyboard_settings_holo.png
java/res/drawable-xlarge-mdpi/sym_keyboard_shift_holo.png
java/res/drawable-xlarge-mdpi/sym_keyboard_shift_locked_holo.png
java/res/drawable-xlarge-mdpi/sym_keyboard_space_holo.png
java/res/drawable-xlarge-mdpi/sym_keyboard_voice_holo.png
java/res/drawable-xlarge-mdpi/sym_keyboard_voice_off_holo.png
java/res/drawable-xlarge-xhdpi/btn_keyboard_key_popup_selected_holo.9.png
java/res/drawable-xlarge-xhdpi/hint_popup_holo.9.png
java/res/layout-xlarge/recognition_status.xml
java/res/values-af/strings.xml
java/res/values-am/strings.xml
java/res/values-ar/strings.xml
java/res/values-be/strings.xml
java/res/values-bg/strings.xml
java/res/values-ca/strings.xml
java/res/values-cs/strings.xml
java/res/values-da/strings.xml
java/res/values-de/strings.xml
java/res/values-el/strings.xml
java/res/values-en-rGB/strings.xml
java/res/values-es-rUS/strings.xml
java/res/values-es/strings.xml
java/res/values-et/strings.xml
java/res/values-fa/strings.xml
java/res/values-fi/strings.xml
java/res/values-fr/strings.xml
java/res/values-hi/strings.xml
java/res/values-hr/strings.xml
java/res/values-hu/strings.xml
java/res/values-in/strings.xml
java/res/values-it/strings.xml
java/res/values-iw/strings.xml
java/res/values-ja/strings.xml
java/res/values-ko/strings.xml
java/res/values-large/donottranslate.xml
java/res/values-lt/strings.xml
java/res/values-lv/strings.xml
java/res/values-ms/strings.xml
java/res/values-nb/strings.xml
java/res/values-nl/strings.xml
java/res/values-pl/strings.xml
java/res/values-pt-rPT/strings.xml
java/res/values-pt/strings.xml
java/res/values-rm/strings.xml
java/res/values-ro/strings.xml
java/res/values-ru/strings.xml
java/res/values-sk/strings.xml
java/res/values-sl/strings.xml
java/res/values-sr/strings.xml
java/res/values-sv/strings.xml
java/res/values-sw/strings.xml
java/res/values-sw600dp/donottranslate.xml
java/res/values-sw768dp/donottranslate.xml
java/res/values-th/strings.xml
java/res/values-tl/strings.xml
java/res/values-tr/strings.xml
java/res/values-uk/strings.xml
java/res/values-vi/strings.xml
java/res/values-xlarge/donottranslate.xml
java/res/values-zh-rCN/strings.xml
java/res/values-zh-rTW/strings.xml
java/res/values-zu/strings.xml
java/res/values/keypress-vibration-durations.xml
java/res/values/predefined-subtypes.xml
java/res/xml-large-land/kbd_popup_template.xml
java/res/xml-large/kbd_key_styles.xml
java/res/xml-large/kbd_popup_template.xml
java/res/xml-large/kbd_qwerty_f2.xml
java/res/xml-large/kbd_qwerty_row1.xml
java/res/xml-large/kbd_qwerty_row2.xml
java/res/xml-large/kbd_qwerty_row3.xml
java/res/xml-large/kbd_qwerty_row4.xml
java/res/xml-large/kbd_row3_right.xml
java/res/xml-large/kbd_rows_arabic.xml
java/res/xml-large/kbd_rows_azerty.xml
java/res/xml-large/kbd_rows_hebrew.xml
java/res/xml-large/kbd_rows_qwerty.xml
java/res/xml-large/kbd_rows_qwertz.xml
java/res/xml-large/kbd_rows_russian.xml
java/res/xml-large/kbd_rows_scandinavian.xml
java/res/xml-large/kbd_rows_serbian.xml
java/res/xml-large/kbd_rows_spanish.xml
java/res/xml-large/kbd_symbols.xml
java/res/xml-large/kbd_symbols_shift.xml
java/res/xml-sw600dp-land/kbd_more_keys_keyboard_template.xml
java/res/xml-sw600dp-land/kbd_popup_template.xml
java/res/xml-sw600dp/kbd_more_keys_keyboard_template.xml
java/res/xml-sw600dp/kbd_popup_template.xml
java/res/xml-sw600dp/kbd_row3_right.xml
java/res/xml-sw600dp/kbd_rows_qwerty.xml
java/res/xml-sw600dp/keys_comma_period.xml
java/res/xml-sw768dp-land/kbd_more_keys_keyboard_template.xml
java/res/xml-sw768dp-land/kbd_popup_template.xml
java/res/xml-sw768dp/kbd_more_keys_keyboard_template.xml
java/res/xml-sw768dp/kbd_popup_template.xml
java/res/xml-sw768dp/kbd_row3_right2.xml
java/res/xml-sw768dp/kbd_rows_qwerty.xml
java/res/xml-sw768dp/row_symbols_shift4.xml
java/res/xml-xlarge-land/kbd_popup_template.xml
java/res/xml-xlarge/kbd_key_styles.xml
java/res/xml-xlarge/kbd_popup_template.xml
java/res/xml-xlarge/kbd_qwerty_row1.xml
java/res/xml-xlarge/kbd_qwerty_row2.xml
java/res/xml-xlarge/kbd_qwerty_row3.xml
java/res/xml-xlarge/kbd_qwerty_row4.xml
java/res/xml-xlarge/kbd_row3_right2.xml
java/res/xml-xlarge/kbd_rows_arabic.xml
java/res/xml-xlarge/kbd_rows_azerty.xml
java/res/xml-xlarge/kbd_rows_hebrew.xml
java/res/xml-xlarge/kbd_rows_qwerty.xml
java/res/xml-xlarge/kbd_rows_qwertz.xml
java/res/xml-xlarge/kbd_rows_russian.xml
java/res/xml-xlarge/kbd_rows_scandinavian.xml
java/res/xml-xlarge/kbd_rows_serbian.xml
java/res/xml-xlarge/kbd_rows_spanish.xml
java/res/xml-xlarge/kbd_symbols.xml
java/res/xml-xlarge/kbd_symbols_shift.xml
java/res/xml/key_azerty_quote.xml
java/res/xml/key_f1.xml
java/res/xml/method.xml
java/src/com/android/inputmethod/compat/InputMethodServiceCompatWrapper.java
java/src/com/android/inputmethod/latin/Utils.java
native/Android.mk
Change-Id: I96e8e042f636ed8e5cc023cf8514f13121e39195
2012-07-04 15:38:21 +09:00
Ying Wang
b0593636b1
Import translations. DO NOT MERGE
...
Change-Id: I9c9bbd6dda1e978e29e985296cb624035d45497d
Auto-generated-cl: translation import
2012-07-03 14:21:10 -07:00
Eric Fischer
d0ba95678e
Import translations. DO NOT MERGE
...
Change-Id: I13c7109bb886ef2860cbb4fc24650dd2b8badbcb
Auto-generated-cl: translation import
2012-07-02 14:37:28 -07:00
Jean Chalard
3ca3afe971
Merge "Update dictionaries."
2012-07-01 20:55:47 -07:00
Ying Wang
26c45718a5
Import translations. DO NOT MERGE
...
Change-Id: I1c7b1b7877fdbf6963b7a034a8ec197004f97b0e
Auto-generated-cl: translation import
2012-06-29 14:05:31 -07:00
Jean Chalard
6f7b1ff468
Update dictionaries.
...
- English : some words caught through regression tests
- English : some words externally reported
- French : some words externally reported
- French : finished review of all accented words
Bug: 6726969
Bug: 6730031
Change-Id: I37d0dc310db2c79e03ac7ad452391e92d9b13357
2012-06-29 19:30:01 +09:00
Tadashi G. Takaoka
69527d4d60
am 5e5cf045: am 7f7947c9: Keep subtypes in method.xml the same as pre-JellyBean
...
* commit '5e5cf045ca6debafcc29ae1c47afda4a3a152326':
Keep subtypes in method.xml the same as pre-JellyBean
2012-06-27 21:58:53 -07:00
Tadashi G. Takaoka
7f7947c97b
Keep subtypes in method.xml the same as pre-JellyBean
...
This change prevents Android Keyboard subtypes being mistakenly
disabled when upgrading from pre-JellyBean to JellyBean.
Bug: 6750906
Change-Id: I05de6c512e7aa17356e415476e5248986c7d4253
2012-06-28 13:44:09 +09:00
Ying Wang
ca5449bf4f
Import translations. DO NOT MERGE
...
Change-Id: I3d022f22729b758a73352f0e7361e3aead0ef062
2012-06-27 17:16:15 -07:00
Jean Chalard
bf0cae3695
Merge "Reword the 'word prediction' option"
2012-06-26 02:45:49 -07:00
Jean Chalard
8d076be2d1
Reword the 'word prediction' option
...
Bug: 6694141
Change-Id: Ic8fd902554cdf81998f3806a58484d9733848d99
2012-06-26 18:23:06 +09:00
Tadashi G. Takaoka
3c5db23c7a
Merge "Tune CHAR LIMIT"
2012-06-25 20:02:43 -07:00
Tadashi G. Takaoka
11327c7b20
Tune CHAR LIMIT
...
Bug: 6513247
Change-Id: I55e36620bd8b2e7b47a51ccde1b0bf3e277cd56b
2012-06-26 11:00:19 +09:00
Jean Chalard
30dd558802
Merge "Pull the "next word prediction" option up a level."
2012-06-25 18:54:28 -07:00
Eric Fischer
43d9b7818b
Import translations. DO NOT MERGE
...
Change-Id: I8b66b0f81300af586db2db3f653ce3e2882a7efe
2012-06-25 13:47:45 -07:00
Eric Fischer
04f0b2113d
Import translations. DO NOT MERGE
...
Change-Id: Ie741f7f0dccd2aef3ba43ac02776eaac9cb4f9af
2012-06-25 13:44:10 -07:00
Jean Chalard
e9e51cab78
Pull the "next word prediction" option up a level.
...
Bug: 6694141
Change-Id: Ib01575b0994e69ef232a234c575242ec49ed0679
2012-06-25 12:15:21 +09:00
Eric Fischer
142d6bb377
Import translations. DO NOT MERGE
...
Change-Id: Ida61fe3b2464868d3bb6d4b42032273edbf39689
2012-06-21 16:07:47 -07:00
Eric Fischer
f44adb1845
Import translations. DO NOT MERGE
...
Change-Id: If472b6e3c80691ad057990f7c6e2710fc8758e2a
2012-06-21 16:04:00 -07:00
Jean Chalard
83f4a9866a
Cleanup, part 10 : remove from the code obsolete options (C10)
...
Change-Id: Id0806ad3dc7ccb632713eebaca76f0bab26ece5d
2012-06-21 10:07:05 +09:00
Ying Wang
44b459c910
Import translations. DO NOT MERGE
...
Change-Id: Ic9cd1c250611e5b25604d55d4115391068052f36
2012-06-20 14:59:06 -07:00
Tadashi G. Takaoka
563b48a976
am 8ce23247: am cc2f8c27: Merge "Shorten the key typing timeout parameter to 350ms" into jb-dev
...
* commit '8ce23247aefdab60dc6b555a82a563018c766ea8':
Shorten the key typing timeout parameter to 350ms
2012-06-18 18:23:51 -07:00
Tadashi G. Takaoka
cc2f8c27d9
Merge "Shorten the key typing timeout parameter to 350ms" into jb-dev
2012-06-18 18:18:33 -07:00
Tadashi G. Takaoka
c50686bff5
Shorten the key typing timeout parameter to 350ms
...
Bug: 6688921
Change-Id: Ia6d6d98577769a3ce6a39873559993229156f2b8
2012-06-18 17:38:33 -07:00
Jean Chalard
ba6bc24e62
am 50152821: am a1425660: Merge "Make sure whitelist targets are in the main dictionary" into jb-dev
...
* commit '501528218da3b3043eab83201928518bf7cdc2ce':
Make sure whitelist targets are in the main dictionary
2012-06-18 17:08:14 -07:00
Jean Chalard
a1425660c5
Merge "Make sure whitelist targets are in the main dictionary" into jb-dev
2012-06-18 17:04:35 -07:00
Ying Wang
a957b7c5e1
Merge "Import translations. DO NOT MERGE"
2012-06-18 16:38:26 -07:00
Ying Wang
27b9194d3e
Import translations. DO NOT MERGE
...
Change-Id: I1f989dc6fc44d4e5a7632630fc2717d6a51b9eb8
2012-06-18 15:44:53 -07:00
Ying Wang
d7cedda932
Merge "Import translations. DO NOT MERGE" into jb-dev
2012-06-18 15:42:04 -07:00
Ying Wang
7d5c9c700b
Import translations. DO NOT MERGE
...
Change-Id: I151800deab6dc7754d4671e860585dec1b057472
2012-06-18 15:40:28 -07:00
Tadashi G. Takaoka
a5bbb8df75
am e4bbff78: am 38dc9ca3: Fix duplicate period on Persian tablet keyboard
...
* commit 'e4bbff783bddb70f52402454987ede281fb86039':
Fix duplicate period on Persian tablet keyboard
2012-06-18 10:52:54 -07:00
Tadashi G. Takaoka
794a9c913a
am 58f9b35e: am 6de1b7a7: Fix Persian keyboard having correct code points
...
* commit '58f9b35e1cf5a975ec1312858aad9b5cc307fda8':
Fix Persian keyboard having correct code points
2012-06-18 10:52:46 -07:00
Jean Chalard
c13c805db7
am a0c28d2d: am d41ee40b: Merge "Update dictionaries." into jb-dev
...
* commit 'a0c28d2d3805ba2358fdb6b928e8934810e4d483':
Update dictionaries.
2012-06-18 10:52:43 -07:00
Tadashi G. Takaoka
38dc9ca314
Fix duplicate period on Persian tablet keyboard
...
Bug: 6679579
Change-Id: I8bccbfbdf7ea1fa1b78a5af05eb1df100f22ab0c
2012-06-18 10:33:03 -07:00
Jean Chalard
401e70535e
Make sure whitelist targets are in the main dictionary
...
Bug: 6680976
Change-Id: Ieddb5eecb813da3a8a515930568e356bc3526386
2012-06-19 02:08:57 +09:00
Tadashi G. Takaoka
6de1b7a709
Fix Persian keyboard having correct code points
...
Bug: 6679850
Change-Id: Iaa33f48ffb5634de31e039574fb58185c6c078e8
2012-06-16 20:30:45 -07:00
Ying Wang
e59ed19988
Merge "Import translations. DO NOT MERGE" into jb-dev
2012-06-15 15:32:17 -07:00
Ying Wang
32c465ec4d
Import translations. DO NOT MERGE
...
Change-Id: I05170c7ba3a63ae88aeb57323c3a0ebac5a938e5
2012-06-15 15:20:35 -07:00
Ying Wang
479a791b7f
Import translations. DO NOT MERGE
...
Change-Id: I3b150bb52f23fbbf138dd3c3ae51a12b5fd79f57
2012-06-15 15:16:58 -07:00
Jean Chalard
79451e0a70
Update dictionaries.
...
- English dict scrubbed for distractors
- EN, FR, IT, DE include improvements from user feedback
Bug: 6394369
Change-Id: I9af5415d0b6a5edfea2956657b0fee7906ebb344
2012-06-16 04:25:43 +09:00
Tadashi G. Takaoka
e904bba54b
am ba0675af: am 0100aef1: Merge "Fix Persian phone keyboard" into jb-dev
...
* commit 'ba0675afd3e9c5c924b9797a666f1ee86b6c335b':
Fix Persian phone keyboard
2012-06-14 20:32:02 -07:00
Tadashi G. Takaoka
0100aef1b1
Merge "Fix Persian phone keyboard" into jb-dev
2012-06-14 20:27:57 -07:00
Tadashi G. Takaoka
91c4362a52
am e2e04553: am bd5ed141: Merge "Add Afgani sign to Persian symbols" into jb-dev
...
* commit 'e2e04553c425a4fa0662efaec7507fc3d5a6b29c':
Add Afgani sign to Persian symbols
2012-06-14 18:30:52 -07:00
Tadashi G. Takaoka
ff2c9e6387
Fix Persian phone keyboard
...
Bug: 6670630
Change-Id: I566b9962b4404143a2eb54a39caca4e84962f935
2012-06-14 17:54:49 -07:00
Tadashi G. Takaoka
9e14e387b0
Add Afgani sign to Persian symbols
...
Bug: 6670613
Change-Id: If18d033a39b763224bea71af2bec70fb67b31c8e
2012-06-14 17:12:04 -07:00
Eric Fischer
8ccc5161fd
Merge "Import translations. DO NOT MERGE"
2012-06-14 14:54:04 -07:00
Jean Chalard
cf6e923b18
am 42ecf39d: am 002e43ea: Merge "Remove irrelevant options." into jb-dev
...
* commit '42ecf39d04df9eb02e57cf29e63552bc04092857':
Remove irrelevant options.
2012-06-14 14:51:37 -07:00
Eric Fischer
3d3ae61517
Import translations. DO NOT MERGE
...
Change-Id: I770aa06b8551f0ba9d440b10eecf075d258cf4de
2012-06-14 14:38:40 -07:00
Jean Chalard
15121cff37
Remove irrelevant options.
...
Bug: 6667355
Change-Id: I39b6db17fb52e80f510cf6462f41d9cb1f8e0341
2012-06-15 05:04:14 +09:00
Tadashi G. Takaoka
c380959f48
am bbf18807: am 1db4f951: Fix the order of Persian diacritics
...
* commit 'bbf188075d5e14626c0609f4c3ee6031f6c6d5a6':
Fix the order of Persian diacritics
2012-06-14 10:33:46 -07:00
