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
ca5449bf4f
Import translations. DO NOT MERGE
...
Change-Id: I3d022f22729b758a73352f0e7361e3aead0ef062
2012-06-27 17:16:15 -07:00
Eric Fischer
43a7a82728
Import translations. DO NOT MERGE
...
Change-Id: I6cad8f4ae58eeb08d8a29137987cb3da60019844
2012-06-07 15:52:50 -07:00
Eric Fischer
494f9fe03d
Import translations. DO NOT MERGE
...
Change-Id: Ie481f0958f930eeadfd160ff3725cec70c9a452c
2012-06-01 13:06:42 -07:00
Eric Fischer
3b4d2725f4
Import translations. DO NOT MERGE
...
Change-Id: Ia904839525f03eaa58e040bef5cea1e979ea2b5c
2012-05-30 14:21:42 -07:00
Eric Fischer
4c4fd10d91
Import translations. DO NOT MERGE
...
Change-Id: Ia9a8ccaa502e31e49abff2392d5ac4971dcf3789
2012-05-16 14:36:12 -07:00
Eric Fischer
5e8d20e487
Import translations. DO NOT MERGE
...
Change-Id: I0a068efa8f0027f7da9c5f418e2dc27f00d85ac7
2012-05-07 14:42:40 -07:00
Eric Fischer
7fe20f1a3f
Import translations. DO NOT MERGE
...
Change-Id: Iee7815d0cdad906ac0724f9b9d6afac4d6940fce
2012-04-26 16:47:31 -07:00
Eric Fischer
9d9b44dc67
Import translations. DO NOT MERGE
...
Change-Id: I80769f5a263835b74a455905d2789e07c2042f16
2012-04-19 14:26:21 -07:00
Eric Fischer
1cbd8d09dd
Import translations. DO NOT MERGE
...
Change-Id: I9a3d2ce38cab8721064389dd61be6114f6df3f27
2012-04-05 15:59:37 -07:00
Eric Fischer
57471f59c4
Import translations. DO NOT MERGE
...
Change-Id: Id999b394a37669f66c9860aa5a67ac9ef2ae3d32
2012-03-30 14:41:58 -07:00
Eric Fischer
a8ef547d9b
Import translations. DO NOT MERGE
...
Change-Id: Ieca91db4e16672a88d70d2f87d965f5382b18e05
2012-03-29 14:55:22 -07:00
Eric Fischer
77541fc92e
Import translations. DO NOT MERGE
...
Change-Id: Iab45cb6beb91770c53ca6a8c0947f9e7ab838bf4
2012-03-07 14:44:44 -08:00
Eric Fischer
97b6343a38
Import translations. DO NOT MERGE
...
Change-Id: If76e0272d3a4b1ec294ce905accf7bd0280b96dd
2012-03-05 15:49:15 -08:00
Eric Fischer
d1a37520d0
Import translations.
...
Change-Id: I59fdeb4d9df08e82e56d5545ffaaa66e5a04304e
2012-02-17 16:31:50 -08:00
Eric Fischer
b396ea9ede
Import translations. DO NOT MERGE
...
Change-Id: I8be564ef6befc36c59caa155f4b9c6c74740d75b
2012-02-13 15:19:16 -08:00
Eric Fischer
3a4d6321aa
Import translations. DO NOT MERGE
...
Change-Id: I6a592e84d239cf9df93f01aa0c2815c8caba7b41
2012-02-10 14:12:06 -08:00
Eric Fischer
8de2bd1bc5
Import translations. DO NOT MERGE
...
Change-Id: I492ab5c1ef14e0d035323d4cbdeb56d6a0e8e31c
2012-02-08 13:55:24 -08:00
Eric Fischer
897d1302f5
Import translations. DO NOT MERGE
...
Change-Id: If14fd8c2180e4c82cd9f01c730fbc140622c7486
2012-02-03 13:01:42 -08:00
Eric Fischer
7f94a529b6
Import translations. DO NOT MERGE
...
Change-Id: Iddfa678726179e05580b137b392f336fde3985b2
2012-02-02 13:09:26 -08:00
Eric Fischer
49761501db
Import translations. DO NOT MERGE
...
Change-Id: I89dcb839308eadb722f91ccd4327208d8d477dc2
2012-01-27 12:02:20 -08:00
Eric Fischer
2c4f044739
Import translations. DO NOT MERGE
...
Change-Id: Ia3e843569f25a42ece22b35861c56c519ae15756
2012-01-25 17:13:55 -08:00
Eric Fischer
07af2249bb
Import revised translations.
...
Change-Id: Ie6d481360e801a67f4bc0309a7151b1640bd3c40
2011-12-29 13:37:16 -08:00
Eric Fischer
d707eeceb5
Import revised translations.
...
Change-Id: I3c98722dfddac5fe3b600cae61255f15540666e4
2011-10-18 15:50:51 -07:00
Eric Fischer
14583f9e5d
Import revised translations.
...
Change-Id: I26adc3038ae5f4d9593f7a71a9efc2967e77d223
2011-10-10 11:29:19 -07:00
Eric Fischer
991a473707
Import revised translations.
...
Change-Id: I9fe5fbc28c1bb82bd094841ba3edcbcd8fe1384a
2011-09-30 16:47:24 -07:00
Eric Fischer
5de6586036
Import revised translations.
...
Change-Id: I74959a565a438f6f6a96b67275a84ac73015ed02
2011-09-20 10:41:51 -07:00
Tadashi G. Takaoka
4630590350
Remove unused string resource ngram_category
...
This is a follow up change for Ib1fc608a.
Change-Id: Id53965310fa4d13739835f37e1d6facf5b654a3f
2011-09-12 18:12:46 +09:00
Tadashi G. Takaoka
7ac280895f
Remove unused string resource label_more_key
...
Change-Id: Id798ad572344beca39e2775090c362ffc1a12809
2011-09-12 17:30:18 +09:00
Eric Fischer
7becf36a07
Import revised translations.
...
Change-Id: Ib94827629904dceb6808f4571b81b7f42dafe026
2011-09-02 15:07:23 -07:00
Eric Fischer
790c77fdc5
Import revised translations.
...
Change-Id: I8a8e531887b11318de0af7e15eaff82ae4e51d85
2011-08-12 17:22:07 -07:00
Eric Fischer
bf8aa9d348
Import revised translations.
...
Change-Id: Ibbe7e9a4a5543ad2627e8d05fcdf8cfa4a14e27d
2011-08-05 17:25:10 -07:00
Eric Fischer
df4db22449
Import revised translations.
...
Change-Id: Idd149b6bec4a78bc7c5f95096bdc2d8e5eaf64c5
2011-08-02 11:40:09 -07:00
Eric Fischer
c02a1617c8
Merge "Import revised translations."
2011-07-26 13:09:39 -07:00
Eric Fischer
a953a3c137
Import revised translations.
...
Change-Id: I6686b5c714afab6b4ca2534b1bbd24205005220a
2011-07-26 11:49:54 -07:00
Jean Chalard
f50aa19337
Purge quick fixes option.
...
This change removes everything related to the quick fixes
Latin IME option item.
Note that Autotext is still used if the current subtype language
is the same as the system language.
Bug: 4985058
Change-Id: I51728a2190543ffb9e004470674ef6257b14f6c2
2011-07-26 16:25:57 +09:00
Tadashi G. Takaoka
ef5dfc480c
Remove sliding spacebar language switcher
...
Bug: 4971680
Change-Id: Ia3485ddcf8051bf7b7ba7f7a37fa75c3bc8a4798
2011-07-19 23:24:49 -07:00
Eric Fischer
303077bcb0
Import revised translations.
...
Change-Id: Id17475b42f5037de6c27d40e3c4ba57cbad64287
2011-07-15 16:52:04 -07:00
Eric Fischer
ff53f0fd97
Import revised translations.
...
Change-Id: I6a63166506259331cd0481b41e97527d5133d52c
2011-07-07 11:50:08 -07:00
Eric Fischer
cdc12db404
Import revised translations.
...
Change-Id: I5dc1e545c6d8964fe6d58552fce56ef4b8d048f0
2011-06-20 15:01:22 -07:00
Eric Fischer
a205d23ffd
Import revised translations.
...
Change-Id: I8d37e4dc59fbb9fdb55597b04840e86838ae0650
2011-05-17 17:05:55 -07:00
Tadashi G. Takaoka
a645d88228
Remove unused resources
...
Bug: 4436327
Change-Id: I2573786aac5fd8d543cf12d24c951b67c7353fd7
2011-05-16 16:22:39 +09:00
Tadashi G. Takaoka
101a00e3d4
Revert "Added support for speaking keys through accessibility service."
...
This reverts commit dcade18113
.
Bug: 4379983
Change-Id: I2448d8f03990a39a3e328a88904d82efc70241a2
2011-05-12 00:14:55 +09:00
Eric Fischer
837432d4e2
Import revised translations.
...
Change-Id: I71334fc9054623b29cf42188f259712f1619abf2
2011-04-26 16:09:00 -07:00
Eric Fischer
85427b3d8e
Import revised translations.
...
Change-Id: I8c2fb2177e47ad50cf0ae1a191d2b8b4186c0700
2011-04-07 13:59:50 -07:00
Eric Fischer
19292fbff6
Import revised translations.
...
Change-Id: Ic7ae2c78e732707ef2504e82c08851fe627465b3
2011-03-01 11:03:19 -08:00
Eric Fischer
2ca4e9ae8a
Import revised translations.
...
Change-Id: I4b678c68e9a32ac77c46958ef2c530da81508978
2011-02-17 10:21:28 -08:00
Eric Fischer
9cfb874f7f
Import revised translations.
...
Change-Id: I3d92d46d7683c07e455ba15c0befee9199a442bc
2010-12-23 14:37:28 -08:00
Eric Fischer
68b6932024
Import revised translations.
...
Change-Id: I65a87452bbd35b850def20bc37eedf3698f4e931
2010-12-14 13:59:57 -08:00
Tadashi G. Takaoka
246acc5033
Make "Tab" and "ALT" and "123" as donottranslate resources
...
Bug: 3273889
Change-Id: I1bd47ffbc7bc92d66d421c5f2787acf14e08e0f7
2010-12-14 15:33:24 +09:00