Merge remote branch 'goog/master' into mastermerge

Conflicts: java/src/com/android/inputmethod/latin/LatinIME.java Change-Id: I8fe443f434ced0cf18b1aa86e38fb8913a5b75c2
2010-09-03 22:57:28 +09:00 · 2010-09-03 22:57:28 +09:00 · 4d67480fe2
parent 17fe18350f 48206a62c9
commit 4d67480fe2
204 changed files with 2656 additions and 3352 deletions
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@ -47,6 +47,7 @@
 $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/LatinIME*)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/LatinIME.apk)

+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libjni_latinime_intermediates)
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
 # ************************************************
--- a/java/res/drawable-en-hdpi/sym_keyboard_delete.png
+++ b/java/res/drawable-en-hdpi/sym_keyboard_delete.png
--- a/java/res/drawable-en-mdpi/sym_keyboard_delete.png
+++ b/java/res/drawable-en-mdpi/sym_keyboard_delete.png
--- a/java/res/drawable-en-mdpi/sym_keyboard_feedback_delete.png
+++ b/java/res/drawable-en-mdpi/sym_keyboard_feedback_delete.png
--- a/java/res/drawable-hdpi/btn_close_normal.png
+++ b/java/res/drawable-hdpi/btn_close_normal.png
--- a/java/res/drawable-hdpi/btn_close_pressed.png
+++ b/java/res/drawable-hdpi/btn_close_pressed.png
--- a/java/res/drawable-hdpi/btn_close_selected.png
+++ b/java/res/drawable-hdpi/btn_close_selected.png
--- a/java/res/drawable-hdpi/btn_keyboard_key_dark_normal.9.png
+++ b/java/res/drawable-hdpi/btn_keyboard_key_dark_normal.9.png
--- a/java/res/drawable-hdpi/btn_keyboard_key_dark_normal_off.9.png
+++ b/java/res/drawable-hdpi/btn_keyboard_key_dark_normal_off.9.png
--- a/java/res/drawable-hdpi/btn_keyboard_key_dark_normal_on.9.png
+++ b/java/res/drawable-hdpi/btn_keyboard_key_dark_normal_on.9.png
--- a/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed.9.png
+++ b/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed.9.png
--- a/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_off.9.png
+++ b/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_off.9.png
--- a/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_on.9.png
+++ b/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_on.9.png
--- a/java/res/drawable-hdpi/btn_keyboard_key_light_normal.9.png
+++ b/java/res/drawable-hdpi/btn_keyboard_key_light_normal.9.png
--- a/java/res/drawable-hdpi/btn_keyboard_key_light_popup_normal.9.png
+++ b/java/res/drawable-hdpi/btn_keyboard_key_light_popup_normal.9.png
--- a/java/res/drawable-hdpi/btn_keyboard_key_light_popup_selected.9.png
+++ b/java/res/drawable-hdpi/btn_keyboard_key_light_popup_selected.9.png
--- a/java/res/drawable-hdpi/btn_keyboard_key_light_pressed.9.png
+++ b/java/res/drawable-hdpi/btn_keyboard_key_light_pressed.9.png
--- a/java/res/drawable-hdpi/btn_keyboard_normal_metal.9.png
+++ b/java/res/drawable-hdpi/btn_keyboard_normal_metal.9.png
--- a/java/res/drawable-hdpi/btn_keyboard_toggle_off.png
+++ b/java/res/drawable-hdpi/btn_keyboard_toggle_off.png
--- a/java/res/drawable-hdpi/btn_keyboard_toggle_on.png
+++ b/java/res/drawable-hdpi/btn_keyboard_toggle_on.png
--- a/java/res/drawable-hdpi/btn_led_off.9.png
+++ b/java/res/drawable-hdpi/btn_led_off.9.png
--- a/java/res/drawable-hdpi/btn_led_on.9.png
+++ b/java/res/drawable-hdpi/btn_led_on.9.png
--- a/java/res/drawable-hdpi/cancel.png
+++ b/java/res/drawable-hdpi/cancel.png
--- a/java/res/drawable-hdpi/dialog_top_dark_bottom_medium.9.png
+++ b/java/res/drawable-hdpi/dialog_top_dark_bottom_medium.9.png
--- a/java/res/drawable-hdpi/ic_dialog_alert_large.png
+++ b/java/res/drawable-hdpi/ic_dialog_alert_large.png
--- a/java/res/drawable-hdpi/ic_dialog_voice_input.png
+++ b/java/res/drawable-hdpi/ic_dialog_voice_input.png
--- a/java/res/drawable-hdpi/ic_dialog_wave_0_0.png
+++ b/java/res/drawable-hdpi/ic_dialog_wave_0_0.png
--- a/java/res/drawable-hdpi/ic_dialog_wave_1_3.png
+++ b/java/res/drawable-hdpi/ic_dialog_wave_1_3.png
--- a/java/res/drawable-hdpi/ic_dialog_wave_2_3.png
+++ b/java/res/drawable-hdpi/ic_dialog_wave_2_3.png
--- a/java/res/drawable-hdpi/ic_dialog_wave_3_3.png
+++ b/java/res/drawable-hdpi/ic_dialog_wave_3_3.png
--- a/java/res/drawable-hdpi/ic_dialog_wave_4_3.png
+++ b/java/res/drawable-hdpi/ic_dialog_wave_4_3.png
--- a/java/res/drawable-hdpi/ic_suggest_strip_scroll_left_arrow.png
+++ b/java/res/drawable-hdpi/ic_suggest_strip_scroll_left_arrow.png
--- a/java/res/drawable-hdpi/ic_suggest_strip_scroll_right_arrow.png
+++ b/java/res/drawable-hdpi/ic_suggest_strip_scroll_right_arrow.png
--- a/java/res/drawable-hdpi/keyboard_dark_background.9.png
+++ b/java/res/drawable-hdpi/keyboard_dark_background.9.png
--- a/java/res/drawable-hdpi/keyboard_key_feedback_background.9.png
+++ b/java/res/drawable-hdpi/keyboard_key_feedback_background.9.png
--- a/java/res/drawable-hdpi/keyboard_key_feedback_more_background.9.png
+++ b/java/res/drawable-hdpi/keyboard_key_feedback_more_background.9.png
--- a/java/res/drawable-hdpi/keyboard_popup_panel_background.9.png
+++ b/java/res/drawable-hdpi/keyboard_popup_panel_background.9.png
--- a/java/res/drawable-hdpi/keyboard_popup_panel_trans_background.9.png
+++ b/java/res/drawable-hdpi/keyboard_popup_panel_trans_background.9.png
--- a/java/res/drawable-hdpi/keyboard_suggest_strip.9.png
+++ b/java/res/drawable-hdpi/keyboard_suggest_strip.9.png
--- a/java/res/drawable-hdpi/keyboard_suggest_strip_divider.png
+++ b/java/res/drawable-hdpi/keyboard_suggest_strip_divider.png
--- a/java/res/drawable-hdpi/mic_slash.png
+++ b/java/res/drawable-hdpi/mic_slash.png
--- a/java/res/drawable-hdpi/ok_cancel.png
+++ b/java/res/drawable-hdpi/ok_cancel.png
--- a/java/res/drawable-hdpi/speak_now_level0.png
+++ b/java/res/drawable-hdpi/speak_now_level0.png
--- a/java/res/drawable-hdpi/speak_now_level1.png
+++ b/java/res/drawable-hdpi/speak_now_level1.png
--- a/java/res/drawable-hdpi/speak_now_level2.png
+++ b/java/res/drawable-hdpi/speak_now_level2.png
--- a/java/res/drawable-hdpi/speak_now_level3.png
+++ b/java/res/drawable-hdpi/speak_now_level3.png
--- a/java/res/drawable-hdpi/speak_now_level4.png
+++ b/java/res/drawable-hdpi/speak_now_level4.png
--- a/java/res/drawable-hdpi/speak_now_level5.png
+++ b/java/res/drawable-hdpi/speak_now_level5.png
--- a/java/res/drawable-hdpi/speak_now_level6.png
+++ b/java/res/drawable-hdpi/speak_now_level6.png
--- a/java/res/drawable-hdpi/sym_bkeyboard_globe.png
+++ b/java/res/drawable-hdpi/sym_bkeyboard_globe.png
--- a/java/res/drawable-hdpi/sym_bkeyboard_settings.png
+++ b/java/res/drawable-hdpi/sym_bkeyboard_settings.png
--- a/java/res/drawable-hdpi/sym_bkeyboard_tabprev.png
+++ b/java/res/drawable-hdpi/sym_bkeyboard_tabprev.png
--- a/java/res/drawable-hdpi/sym_keyboard_delete.png
+++ b/java/res/drawable-hdpi/sym_keyboard_delete.png
--- a/java/res/drawable-hdpi/sym_keyboard_feedback_123_mic.png
+++ b/java/res/drawable-hdpi/sym_keyboard_feedback_123_mic.png
--- a/java/res/drawable-hdpi/sym_keyboard_feedback_delete.png
+++ b/java/res/drawable-hdpi/sym_keyboard_feedback_delete.png
--- a/java/res/drawable-hdpi/sym_keyboard_feedback_language_arrows_left.png
+++ b/java/res/drawable-hdpi/sym_keyboard_feedback_language_arrows_left.png
--- a/java/res/drawable-hdpi/sym_keyboard_feedback_language_arrows_right.png
+++ b/java/res/drawable-hdpi/sym_keyboard_feedback_language_arrows_right.png
--- a/java/res/drawable-hdpi/sym_keyboard_feedback_mic.png
+++ b/java/res/drawable-hdpi/sym_keyboard_feedback_mic.png
--- a/java/res/drawable-hdpi/sym_keyboard_feedback_numalt.png
+++ b/java/res/drawable-hdpi/sym_keyboard_feedback_numalt.png
--- a/java/res/drawable-hdpi/sym_keyboard_feedback_return.png
+++ b/java/res/drawable-hdpi/sym_keyboard_feedback_return.png
--- a/java/res/drawable-hdpi/sym_keyboard_feedback_search.png
+++ b/java/res/drawable-hdpi/sym_keyboard_feedback_search.png
--- a/java/res/drawable-hdpi/sym_keyboard_feedback_settings.png
+++ b/java/res/drawable-hdpi/sym_keyboard_feedback_settings.png
--- a/java/res/drawable-hdpi/sym_keyboard_feedback_shift.png
+++ b/java/res/drawable-hdpi/sym_keyboard_feedback_shift.png
--- a/java/res/drawable-hdpi/sym_keyboard_feedback_shift_locked.png
+++ b/java/res/drawable-hdpi/sym_keyboard_feedback_shift_locked.png
--- a/java/res/drawable-hdpi/sym_keyboard_feedback_space.png
+++ b/java/res/drawable-hdpi/sym_keyboard_feedback_space.png
--- a/java/res/drawable-hdpi/sym_keyboard_feedback_tab.png
+++ b/java/res/drawable-hdpi/sym_keyboard_feedback_tab.png
--- a/java/res/drawable-hdpi/sym_keyboard_feedback_tabprev.png
+++ b/java/res/drawable-hdpi/sym_keyboard_feedback_tabprev.png
--- a/java/res/drawable-hdpi/sym_keyboard_globe.png
+++ b/java/res/drawable-hdpi/sym_keyboard_globe.png
--- a/java/res/drawable-hdpi/sym_keyboard_language_arrows_left.png
+++ b/java/res/drawable-hdpi/sym_keyboard_language_arrows_left.png
--- a/java/res/drawable-hdpi/sym_keyboard_language_arrows_right.png
+++ b/java/res/drawable-hdpi/sym_keyboard_language_arrows_right.png
--- a/java/res/drawable-hdpi/sym_keyboard_mic.png
+++ b/java/res/drawable-hdpi/sym_keyboard_mic.png
--- a/java/res/drawable-hdpi/sym_keyboard_return.png
+++ b/java/res/drawable-hdpi/sym_keyboard_return.png
--- a/java/res/drawable-hdpi/sym_keyboard_search.png
+++ b/java/res/drawable-hdpi/sym_keyboard_search.png
--- a/java/res/drawable-hdpi/sym_keyboard_settings.png
+++ b/java/res/drawable-hdpi/sym_keyboard_settings.png
--- a/java/res/drawable-hdpi/sym_keyboard_shift.png
+++ b/java/res/drawable-hdpi/sym_keyboard_shift.png
--- a/java/res/drawable-hdpi/sym_keyboard_shift_locked.png
+++ b/java/res/drawable-hdpi/sym_keyboard_shift_locked.png
--- a/java/res/drawable-hdpi/sym_keyboard_space.png
+++ b/java/res/drawable-hdpi/sym_keyboard_space.png
--- a/java/res/drawable-hdpi/sym_keyboard_space_led.9.png
+++ b/java/res/drawable-hdpi/sym_keyboard_space_led.9.png
--- a/java/res/drawable-hdpi/sym_keyboard_tab.png
+++ b/java/res/drawable-hdpi/sym_keyboard_tab.png
--- a/java/res/drawable-hdpi/sym_keyboard_tabprev.png
+++ b/java/res/drawable-hdpi/sym_keyboard_tabprev.png
--- a/java/res/drawable-hdpi/voice_ime_background.9.png
+++ b/java/res/drawable-hdpi/voice_ime_background.9.png
--- a/java/res/drawable-land-hdpi/keyboard_suggest_strip_divider.png
+++ b/java/res/drawable-land-hdpi/keyboard_suggest_strip_divider.png
--- a/java/res/drawable-land-mdpi/keyboard_suggest_strip_divider.png
+++ b/java/res/drawable-land-mdpi/keyboard_suggest_strip_divider.png
--- a/java/res/drawable-mdpi/btn_close_normal.png
+++ b/java/res/drawable-mdpi/btn_close_normal.png
--- a/java/res/drawable-mdpi/btn_close_pressed.png
+++ b/java/res/drawable-mdpi/btn_close_pressed.png
--- a/java/res/drawable-mdpi/btn_close_selected.png
+++ b/java/res/drawable-mdpi/btn_close_selected.png
--- a/java/res/drawable-mdpi/btn_keyboard_key_dark_normal.9.png
+++ b/java/res/drawable-mdpi/btn_keyboard_key_dark_normal.9.png
--- a/java/res/drawable-mdpi/btn_keyboard_key_dark_normal_off.9.png
+++ b/java/res/drawable-mdpi/btn_keyboard_key_dark_normal_off.9.png
--- a/java/res/drawable-mdpi/btn_keyboard_key_dark_normal_on.9.png
+++ b/java/res/drawable-mdpi/btn_keyboard_key_dark_normal_on.9.png
--- a/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed.9.png
+++ b/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed.9.png
--- a/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_off.9.png
+++ b/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_off.9.png
--- a/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_on.9.png
+++ b/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_on.9.png
--- a/java/res/drawable-mdpi/btn_keyboard_key_light_normal.9.png
+++ b/java/res/drawable-mdpi/btn_keyboard_key_light_normal.9.png
--- a/java/res/drawable-mdpi/btn_keyboard_key_light_popup_normal.9.png
+++ b/java/res/drawable-mdpi/btn_keyboard_key_light_popup_normal.9.png
--- a/java/res/drawable-mdpi/btn_keyboard_key_light_popup_selected.9.png
+++ b/java/res/drawable-mdpi/btn_keyboard_key_light_popup_selected.9.png
--- a/java/res/drawable-mdpi/btn_keyboard_key_light_pressed.9.png
+++ b/java/res/drawable-mdpi/btn_keyboard_key_light_pressed.9.png
--- a/java/res/drawable-mdpi/btn_keyboard_normal_metal.9.png
+++ b/java/res/drawable-mdpi/btn_keyboard_normal_metal.9.png
--- a/java/res/drawable-mdpi/btn_keyboard_toggle_off.png
+++ b/java/res/drawable-mdpi/btn_keyboard_toggle_off.png
--- a/java/res/drawable-mdpi/btn_keyboard_toggle_on.png
+++ b/java/res/drawable-mdpi/btn_keyboard_toggle_on.png
--- a/java/res/drawable-mdpi/btn_led_off.9.png
+++ b/java/res/drawable-mdpi/btn_led_off.9.png
--- a/Show More
+++ b/Show More