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
26c45718a5
Import translations. DO NOT MERGE
...
Change-Id: I1c7b1b7877fdbf6963b7a034a8ec197004f97b0e
Auto-generated-cl: translation import
2012-06-29 14:05:31 -07:00
Ying Wang
ca5449bf4f
Import translations. DO NOT MERGE
...
Change-Id: I3d022f22729b758a73352f0e7361e3aead0ef062
2012-06-27 17:16:15 -07:00
Eric Fischer
a4559dacb5
Import translations. DO NOT MERGE
...
Change-Id: Ic8c1aa9ddecf98077a6dfc5ebdee4b9ac0bf8c8c
2012-06-13 15:29:32 -07:00
Eric Fischer
74d36bc8af
Import translations. DO NOT MERGE
...
Change-Id: I2ab623c74a6c9b45558af0241dbd985e851428cd
2012-06-11 14:17:49 -07:00
Eric Fischer
43a7a82728
Import translations. DO NOT MERGE
...
Change-Id: I6cad8f4ae58eeb08d8a29137987cb3da60019844
2012-06-07 15:52:50 -07:00
Eric Fischer
46cc408094
Import translations. DO NOT MERGE
...
Change-Id: If7a9ad8f6df0978783dc23b1812fb41d7acb6b92
2012-06-04 18:57:02 -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
9b9cd3505a
Import translations. DO NOT MERGE
...
Change-Id: I8ac08e201aaaa3bd8e22da27f66c60036f52a605
2012-05-10 15:09:27 -07:00
Eric Fischer
5e8d20e487
Import translations. DO NOT MERGE
...
Change-Id: I0a068efa8f0027f7da9c5f418e2dc27f00d85ac7
2012-05-07 14:42:40 -07:00
Eric Fischer
19b30243d7
Import translations. DO NOT MERGE
...
Change-Id: I8023e0ca7bd730ba92a8a73fef2fd0c4ec339cd3
2012-04-30 14:25:47 -07:00
Eric Fischer
7fe20f1a3f
Import translations. DO NOT MERGE
...
Change-Id: Iee7815d0cdad906ac0724f9b9d6afac4d6940fce
2012-04-26 16:47:31 -07:00
Eric Fischer
7f45ec7bb8
Import translations. DO NOT MERGE
...
Change-Id: I11d27b3c5c1005bd6679f59804f217640f8d5992
2012-04-23 14:03:26 -07:00
Eric Fischer
9d9b44dc67
Import translations. DO NOT MERGE
...
Change-Id: I80769f5a263835b74a455905d2789e07c2042f16
2012-04-19 14:26:21 -07:00
Eric Fischer
b9315e9a85
Import translations. DO NOT MERGE
...
Change-Id: Idd8b8ea44c3b8b5d5dead243fde3189e891f1e9c
2012-04-13 14:40:35 -07:00
Tadashi G. Takaoka
2be51f4fd0
Generate KeyboardLabelsSet from donottranslate-more-keys.xml
...
This change introduces makelabel tool that reads all languages'
donottranslate-more-keys and generate KeyboardLabelsSet.java source
file. The makelabel command must be invoked prior to compile LatinIME.
Change-Id: I7515c7919c535e30f9c80a37bdc831d0f682cd43
2012-04-11 11:23:47 +09:00
Eric Fischer
7be6ce0fd7
Import translations. DO NOT MERGE
...
Change-Id: I2d0942b4d3eaf3e62cde5b38034df60c0ac5cd86
2012-04-10 15:16:14 -07:00
Tadashi G. Takaoka
ed3bac91f2
Introduce KeyboardCodesSet.java and remove keycodes.xml
...
Change-Id: Icfd6d06f47425aa037682d22c895548ba6f047d8
2012-04-10 11:53:58 +09:00
Tadashi G. Takaoka
264045ef81
Extract keycodes.xml from donottranslate-more-keys.xml
...
Change-Id: Iaaf47b018b83f3d51dad348a527f17f8d6df21b6
2012-04-09 17:02:40 +09: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
8b4148e757
Import translations. DO NOT MERGE
...
Change-Id: I8546456a3d567b821a5a409a7459f9043fa04315
2012-03-12 15:25:23 -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
Tadashi G. Takaoka
97bde43740
Settings key always exists in more keys of shortcut/f1 key
...
This change also
* Fix comman/f1 key for Arabic keyboard.
* Removes "show settings key option" and related stuff.
* Renames and simplifies F2 key to shortcut key on 7 inch tablet.
Change-Id: Ib1cf99ad00d9780a2f0d170260e756771e161521
2012-02-17 01:04:11 -08:00
Tadashi G. Takaoka
fed72d6038
Merge "Support fixed order more keys"
2012-02-17 01:01:28 -08:00
Tadashi G. Takaoka
aeeed75848
Support fixed order more keys
...
Change-Id: I979f54e8b54243da4d23cfbe08198d2aa495f870
2012-02-17 00:49:18 -08:00
Eric Fischer
482e0ef983
Import translations.
...
Change-Id: I20bcfc0d6296dc3606ab027e9c78f17e960e62dc
2012-02-16 15:29:44 -08:00
Ken Wakasa
a56639613b
Use more standard Unicode notations in keyboard layout resource files.
...
bug: 5988656
Change-Id: Ie2416ccd790f29934a37e9dc77d7525e5113048a
2012-02-15 06:44:09 +09:00
Eric Fischer
b396ea9ede
Import translations. DO NOT MERGE
...
Change-Id: I8be564ef6befc36c59caa155f4b9c6c74740d75b
2012-02-13 15:19:16 -08:00
Ken Wakasa
09c677f56a
Replace UTF-8 string resources with their hex representations
...
bug: 5988656
Change-Id: Ifc3c3a2eccfc23d75b4066c2c9c02c48dacda55b
2012-02-11 23:05:23 +09:00
Eric Fischer
1bd181fefa
Import translations.
...
Change-Id: I126a880289de548e914ac442740e789e067e5124
2012-02-10 14:14:38 -08:00
Eric Fischer
7ef97ea1f9
Import translations. DO NOT MERGE
...
Change-Id: I02629c1f8dd311899b3aba89bfb1390150ace7ac
2012-02-08 13:56:30 -08:00
Tadashi G. Takaoka
2affaf91a0
Rename mini keyboard to more keys keyboard
...
Change-Id: Ie4c85e8ca5a1f41a420aae5c1cd9c1cb07e237e5
2012-02-08 16:12:31 +09:00
Tadashi G. Takaoka
c217dc9237
Convert one letter Key.outputText to Key.code
...
This change also uses Key.code instead of Key.outputText for the
variety of parentheses keys taht introduced by I85998f17.
Bug: 5975484
Change-Id: I86879c9942d264edc71e5893325a2f582763d12f
2012-02-07 22:34:20 +09:00
Eric Fischer
3f8fc4de9a
Import translations. DO NOT MERGE
...
Change-Id: I9e403e4199935cbb8f356f78316671373324d452
2012-02-03 13:02:58 -08:00
Eric Fischer
8a0bb00989
Import translations. DO NOT MERGE
...
Change-Id: I5d9c89dfe2e5667ef004d1e8b9106279bd23f6f5
2012-02-02 13:10:41 -08:00
Tadashi G. Takaoka
71c695da22
Remove BIDI mirroring hack from Key
...
This change also removes isRtlKeyboard attribute from <Keyboard/>
Bug: 5948247
Change-Id: I85998f17ae146a4c8cd0f419ab820b746cb8974f
2012-02-01 22:58:16 +09:00
Tadashi G. Takaoka
ff858c7ff5
Use MoreKeySpecParser to parse puctuations strip resources
...
This change also
* Doesn't use Key.getRtlParenthesisCode to get correct parentheses
code in RTL context. Intead uses the outputText feature of
moreKeys specification.
* Move CVS string parser from KeyStyles to Utils.
Bug: 5948247
Change-Id: I45752c7d01b4f7d3f3da900b110a2185b336a1f0
2012-02-01 19:33:26 +09:00
Eric Fischer
1e094ac19b
Import translations. DO NOT MERGE
...
Change-Id: I94fbe8b643f97c20d0923e321471e9322d8758fb
2012-01-30 12:50:31 -08:00
Tadashi G. Takaoka
15c99e9f1a
Support addtionalMoreKeys
...
This change also removes
* Unused more_keys_for_q, w, and p.
Change-Id: Idb99e5f6d8c2ad2d28437f42b35b21c282cd181f
2012-01-30 17:04:25 +09: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
Tadashi G. Takaoka
b009a24b83
Support @icon/icon_name for more keys specification
...
Change-Id: I8842e5ce77f9d27a0969df947de292c1830e36b7
2012-01-20 20:09:02 +09:00
Eric Fischer
07af2249bb
Import revised translations.
...
Change-Id: Ie6d481360e801a67f4bc0309a7151b1640bd3c40
2011-12-29 13:37:16 -08:00
Tadashi G. Takaoka
7fe66ea42e
Add a few Arabic symbols
...
Bug: 5458689
Change-Id: I61ce876606ce3fa620d606752c8e5442b8ad78d6
2011-10-26 14:25:11 +09:00
