LatinIME/java/res
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
..
anim Polish fade-in/out animations for the gray-out-while-typing keys 2012-04-12 16:43:24 +09:00
drawable Remove unused resources 2012-03-30 18:06:09 +09:00
drawable-hdpi Update language switch icon 2012-05-17 09:16:53 +09:00
drawable-mdpi Update language switch icon 2012-05-17 09:16:53 +09:00
drawable-xhdpi Update language switch icon 2012-05-17 09:16:53 +09:00
layout Fix one letter suggestion text size on more suggestions panel 2012-06-13 10:44:47 -07:00
raw Merge remote-tracking branch 'goog/master' into mergescript 2012-07-04 15:38:21 +09:00
values Merge remote-tracking branch 'goog/master' into mergescript 2012-07-04 15:38:21 +09:00
values-af Merge remote-tracking branch 'goog/master' into mergescript 2012-07-04 15:38:21 +09:00
values-am Merge remote-tracking branch 'goog/master' into mergescript 2012-07-04 15:38:21 +09:00
values-ar Merge remote-tracking branch 'goog/master' into mergescript 2012-07-04 15:38:21 +09:00
values-be Merge remote-tracking branch 'goog/master' into mergescript 2012-07-04 15:38:21 +09:00
values-bg Merge remote-tracking branch 'goog/master' into mergescript 2012-07-04 15:38:21 +09:00
values-ca Merge remote-tracking branch 'goog/master' into mergescript 2012-07-04 15:38:21 +09:00
values-cs Merge remote-tracking branch 'goog/master' into mergescript 2012-07-04 15:38:21 +09:00
values-da Merge remote-tracking branch 'goog/master' into mergescript 2012-07-04 15:38:21 +09:00
values-de Merge remote-tracking branch 'goog/master' into mergescript 2012-07-04 15:38:21 +09:00
values-el Merge remote-tracking branch 'goog/master' into mergescript 2012-07-04 15:38:21 +09:00
values-en Update dictionaries. 2012-06-16 04:25:43 +09:00
values-en-rGB Merge remote-tracking branch 'goog/master' into mergescript 2012-07-04 15:38:21 +09:00
values-es Merge remote-tracking branch 'goog/master' into mergescript 2012-07-04 15:38:21 +09:00
values-es-rUS Merge remote-tracking branch 'goog/master' into mergescript 2012-07-04 15:38:21 +09:00
values-et Merge remote-tracking branch 'goog/master' into mergescript 2012-07-04 15:38:21 +09:00
values-fa Merge remote-tracking branch 'goog/master' into mergescript 2012-07-04 15:38:21 +09:00
values-fi Merge remote-tracking branch 'goog/master' into mergescript 2012-07-04 15:38:21 +09:00
values-fr Merge remote-tracking branch 'goog/master' into mergescript 2012-07-04 15:38:21 +09:00
values-fr-rCA Support addtionalMoreKeys 2012-01-30 17:04:25 +09:00
values-hdpi Fix calculation of more keys keyboard position based on key preview 2012-05-09 21:23:09 +09:00
values-hi Merge remote-tracking branch 'goog/master' into mergescript 2012-07-04 15:38:21 +09:00
values-hr Merge remote-tracking branch 'goog/master' into mergescript 2012-07-04 15:38:21 +09:00
values-hu Merge remote-tracking branch 'goog/master' into mergescript 2012-07-04 15:38:21 +09:00
values-in Merge remote-tracking branch 'goog/master' into mergescript 2012-07-04 15:38:21 +09:00
values-it Merge remote-tracking branch 'goog/master' into mergescript 2012-07-04 15:38:21 +09:00
values-iw Merge remote-tracking branch 'goog/master' into mergescript 2012-07-04 15:38:21 +09:00
values-ja Merge remote-tracking branch 'goog/master' into mergescript 2012-07-04 15:38:21 +09:00
values-ko Merge remote-tracking branch 'goog/master' into mergescript 2012-07-04 15:38:21 +09:00
values-ky Import translations. DO NOT MERGE 2012-04-11 10:31:56 -07:00
values-land Cleanup keyboard-heights.xml resources 2012-05-30 19:33:30 +09:00
values-lt Merge remote-tracking branch 'goog/master' into mergescript 2012-07-04 15:38:21 +09:00
values-lv Merge remote-tracking branch 'goog/master' into mergescript 2012-07-04 15:38:21 +09:00
values-ms Merge remote-tracking branch 'goog/master' into mergescript 2012-07-04 15:38:21 +09:00
values-nb Merge remote-tracking branch 'goog/master' into mergescript 2012-07-04 15:38:21 +09:00
values-nl Merge remote-tracking branch 'goog/master' into mergescript 2012-07-04 15:38:21 +09:00
values-pl Merge remote-tracking branch 'goog/master' into mergescript 2012-07-04 15:38:21 +09:00
values-pt Merge remote-tracking branch 'goog/master' into mergescript 2012-07-04 15:38:21 +09:00
values-pt-rPT Merge remote-tracking branch 'goog/master' into mergescript 2012-07-04 15:38:21 +09:00
values-rm Merge remote-tracking branch 'goog/master' into mergescript 2012-07-04 15:38:21 +09:00
values-ro Merge remote-tracking branch 'goog/master' into mergescript 2012-07-04 15:38:21 +09:00
values-ru Merge remote-tracking branch 'goog/master' into mergescript 2012-07-04 15:38:21 +09:00
values-sk Merge remote-tracking branch 'goog/master' into mergescript 2012-07-04 15:38:21 +09:00
values-sl Merge remote-tracking branch 'goog/master' into mergescript 2012-07-04 15:38:21 +09:00
values-sr Merge remote-tracking branch 'goog/master' into mergescript 2012-07-04 15:38:21 +09:00
values-sv Merge remote-tracking branch 'goog/master' into mergescript 2012-07-04 15:38:21 +09:00
values-sw Merge remote-tracking branch 'goog/master' into mergescript 2012-07-04 15:38:21 +09:00
values-sw600dp Cleanup keyboard-heights.xml resources 2012-05-30 19:33:30 +09:00
values-sw600dp-land Cleanup keyboard-heights.xml resources 2012-05-30 19:33:30 +09:00
values-sw768dp Cleanup keyboard-heights.xml resources 2012-05-30 19:33:30 +09:00
values-sw768dp-land Cleanup keyboard-heights.xml resources 2012-05-30 19:33:30 +09:00
values-th Merge remote-tracking branch 'goog/master' into mergescript 2012-07-04 15:38:21 +09:00
values-tl Merge remote-tracking branch 'goog/master' into mergescript 2012-07-04 15:38:21 +09:00
values-tr Merge remote-tracking branch 'goog/master' into mergescript 2012-07-04 15:38:21 +09:00
values-uk Merge remote-tracking branch 'goog/master' into mergescript 2012-07-04 15:38:21 +09:00
values-vi Merge remote-tracking branch 'goog/master' into mergescript 2012-07-04 15:38:21 +09:00
values-zh-rCN Merge remote-tracking branch 'goog/master' into mergescript 2012-07-04 15:38:21 +09:00
values-zh-rTW Merge remote-tracking branch 'goog/master' into mergescript 2012-07-04 15:38:21 +09:00
values-zu Merge remote-tracking branch 'goog/master' into mergescript 2012-07-04 15:38:21 +09:00
xml Merge remote-tracking branch 'goog/master' into mergescript 2012-07-04 15:38:21 +09:00
xml-land Move long press shift handling from PointerTracker to KeyboardState 2012-02-01 19:04:21 +09:00
xml-sw600dp Fix duplicate period on Persian tablet keyboard 2012-06-18 10:33:03 -07:00
xml-sw600dp-land Remove tab key from number/phone layout of 7 inch tablet 2012-05-01 12:58:59 +09:00
xml-sw768dp Fix duplicate period on Persian tablet keyboard 2012-06-18 10:33:03 -07:00
xml-sw768dp-land Remove SupportTouchPositionCorrection from subtype extra value 2012-03-28 19:45:28 +09:00