OSDN Git Service

reconcile w/p4
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 30 Mar 2009 05:05:50 +0000 (22:05 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 30 Mar 2009 05:05:50 +0000 (22:05 -0700)
commit4248fb0083e2e0f2f9b379ea5ce898036b900218
treefb2ac65c09f25b378e006c891113a3fefe149142
parent7898d76cc005bbe1c5893a9f57439561e0771cc8
reconcile w/p4
182 files changed:
Android.mk
AndroidManifest.xml [moved from PinyinIME/AndroidManifest.xml with 100% similarity]
PinyinIME/Android.mk [deleted file]
jni/Android.mk [moved from PinyinIME/jni/Android.mk with 100% similarity]
jni/android/com_android_inputmethod_pinyin_PinyinDecoderService.cpp [moved from PinyinIME/jni/android/com_android_inputmethod_pinyin_PinyinDecoderService.cpp with 94% similarity]
jni/command/Makefile [moved from PinyinIME/jni/command/Makefile with 100% similarity]
jni/command/pinyinime_dictbuilder.cpp [moved from PinyinIME/jni/command/pinyinime_dictbuilder.cpp with 100% similarity]
jni/data/rawdict_utf16_65105_freq.txt [moved from PinyinIME/jni/data/rawdict_utf16_65105_freq.txt with 100% similarity]
jni/data/valid_utf16.txt [moved from PinyinIME/jni/data/valid_utf16.txt with 100% similarity]
jni/include/atomdictbase.h [moved from PinyinIME/jni/include/atomdictbase.h with 100% similarity]
jni/include/dictbuilder.h [moved from PinyinIME/jni/include/dictbuilder.h with 100% similarity]
jni/include/dictdef.h [moved from PinyinIME/jni/include/dictdef.h with 100% similarity]
jni/include/dictlist.h [moved from PinyinIME/jni/include/dictlist.h with 100% similarity]
jni/include/dicttrie.h [moved from PinyinIME/jni/include/dicttrie.h with 100% similarity]
jni/include/lpicache.h [moved from PinyinIME/jni/include/lpicache.h with 100% similarity]
jni/include/matrixsearch.h [moved from PinyinIME/jni/include/matrixsearch.h with 99% similarity]
jni/include/mystdlib.h [moved from PinyinIME/jni/include/mystdlib.h with 100% similarity]
jni/include/ngram.h [moved from PinyinIME/jni/include/ngram.h with 100% similarity]
jni/include/pinyinime.h [moved from PinyinIME/jni/include/pinyinime.h with 100% similarity]
jni/include/searchutility.h [moved from PinyinIME/jni/include/searchutility.h with 100% similarity]
jni/include/spellingtable.h [moved from PinyinIME/jni/include/spellingtable.h with 100% similarity]
jni/include/spellingtrie.h [moved from PinyinIME/jni/include/spellingtrie.h with 100% similarity]
jni/include/splparser.h [moved from PinyinIME/jni/include/splparser.h with 100% similarity]
jni/include/sync.h [moved from PinyinIME/jni/include/sync.h with 100% similarity]
jni/include/userdict.h [moved from PinyinIME/jni/include/userdict.h with 100% similarity]
jni/include/utf16char.h [moved from PinyinIME/jni/include/utf16char.h with 100% similarity]
jni/include/utf16reader.h [moved from PinyinIME/jni/include/utf16reader.h with 100% similarity]
jni/share/dictbuilder.cpp [moved from PinyinIME/jni/share/dictbuilder.cpp with 98% similarity]
jni/share/dictlist.cpp [moved from PinyinIME/jni/share/dictlist.cpp with 100% similarity]
jni/share/dicttrie.cpp [moved from PinyinIME/jni/share/dicttrie.cpp with 100% similarity]
jni/share/lpicache.cpp [moved from PinyinIME/jni/share/lpicache.cpp with 100% similarity]
jni/share/matrixsearch.cpp [moved from PinyinIME/jni/share/matrixsearch.cpp with 95% similarity]
jni/share/mystdlib.cpp [moved from PinyinIME/jni/share/mystdlib.cpp with 100% similarity]
jni/share/ngram.cpp [moved from PinyinIME/jni/share/ngram.cpp with 100% similarity]
jni/share/pinyinime.cpp [moved from PinyinIME/jni/share/pinyinime.cpp with 100% similarity]
jni/share/searchutility.cpp [moved from PinyinIME/jni/share/searchutility.cpp with 100% similarity]
jni/share/spellingtable.cpp [moved from PinyinIME/jni/share/spellingtable.cpp with 100% similarity]
jni/share/spellingtrie.cpp [moved from PinyinIME/jni/share/spellingtrie.cpp with 100% similarity]
jni/share/splparser.cpp [moved from PinyinIME/jni/share/splparser.cpp with 100% similarity]
jni/share/sync.cpp [moved from PinyinIME/jni/share/sync.cpp with 100% similarity]
jni/share/userdict.cpp [moved from PinyinIME/jni/share/userdict.cpp with 100% similarity]
jni/share/utf16char.cpp [moved from PinyinIME/jni/share/utf16char.cpp with 100% similarity]
jni/share/utf16reader.cpp [moved from PinyinIME/jni/share/utf16reader.cpp with 100% similarity]
lib/Android.mk [moved from PinyinIME/lib/Android.mk with 100% similarity]
lib/com/android/inputmethod/pinyin/IPinyinDecoderService.aidl [moved from PinyinIME/lib/com/android/inputmethod/pinyin/IPinyinDecoderService.aidl with 100% similarity]
res/drawable/app_icon.png [moved from PinyinIME/res/drawable/app_icon.png with 100% similarity]
res/drawable/arrow_bg.xml [moved from PinyinIME/res/drawable/arrow_bg.xml with 100% similarity]
res/drawable/arrow_left.png [moved from PinyinIME/res/drawable/arrow_left.png with 100% similarity]
res/drawable/arrow_right.png [moved from PinyinIME/res/drawable/arrow_right.png with 100% similarity]
res/drawable/candidate_balloon_bg.9.png [moved from PinyinIME/res/drawable/candidate_balloon_bg.9.png with 100% similarity]
res/drawable/candidate_hl_bg.9.png [moved from PinyinIME/res/drawable/candidate_hl_bg.9.png with 100% similarity]
res/drawable/candidates_area_bg.9.png [moved from PinyinIME/res/drawable/candidates_area_bg.9.png with 100% similarity]
res/drawable/candidates_vertical_line.png [moved from PinyinIME/res/drawable/candidates_vertical_line.png with 100% similarity]
res/drawable/cands_container_bg.9.png [moved from PinyinIME/res/drawable/cands_container_bg.9.png with 100% similarity]
res/drawable/comma_full_icon.png [moved from PinyinIME/res/drawable/comma_full_icon.png with 100% similarity]
res/drawable/comma_full_popup_icon.png [moved from PinyinIME/res/drawable/comma_full_popup_icon.png with 100% similarity]
res/drawable/composing_area_bg.9.png [moved from PinyinIME/res/drawable/composing_area_bg.9.png with 100% similarity]
res/drawable/composing_area_cursor.png [moved from PinyinIME/res/drawable/composing_area_cursor.png with 100% similarity]
res/drawable/composing_hl_bg.9.png [moved from PinyinIME/res/drawable/composing_hl_bg.9.png with 100% similarity]
res/drawable/delete_icon.png [moved from PinyinIME/res/drawable/delete_icon.png with 100% similarity]
res/drawable/delete_popup_icon.png [moved from PinyinIME/res/drawable/delete_popup_icon.png with 100% similarity]
res/drawable/dun_icon.png [moved from PinyinIME/res/drawable/dun_icon.png with 100% similarity]
res/drawable/dun_popup_icon.png [moved from PinyinIME/res/drawable/dun_popup_icon.png with 100% similarity]
res/drawable/emotion_icon_00.png [moved from PinyinIME/res/drawable/emotion_icon_00.png with 100% similarity]
res/drawable/emotion_icon_00_popup.png [moved from PinyinIME/res/drawable/emotion_icon_00_popup.png with 100% similarity]
res/drawable/emotion_icon_01.png [moved from PinyinIME/res/drawable/emotion_icon_01.png with 100% similarity]
res/drawable/emotion_icon_01_popup.png [moved from PinyinIME/res/drawable/emotion_icon_01_popup.png with 100% similarity]
res/drawable/emotion_icon_02.png [moved from PinyinIME/res/drawable/emotion_icon_02.png with 100% similarity]
res/drawable/emotion_icon_02_popup.png [moved from PinyinIME/res/drawable/emotion_icon_02_popup.png with 100% similarity]
res/drawable/emotion_icon_03.png [moved from PinyinIME/res/drawable/emotion_icon_03.png with 100% similarity]
res/drawable/emotion_icon_03_popup.png [moved from PinyinIME/res/drawable/emotion_icon_03_popup.png with 100% similarity]
res/drawable/emotion_icon_04.png [moved from PinyinIME/res/drawable/emotion_icon_04.png with 100% similarity]
res/drawable/emotion_icon_04_popup.png [moved from PinyinIME/res/drawable/emotion_icon_04_popup.png with 100% similarity]
res/drawable/emotion_icon_05.png [moved from PinyinIME/res/drawable/emotion_icon_05.png with 100% similarity]
res/drawable/emotion_icon_05_popup.png [moved from PinyinIME/res/drawable/emotion_icon_05_popup.png with 100% similarity]
res/drawable/emotion_icon_06.png [moved from PinyinIME/res/drawable/emotion_icon_06.png with 100% similarity]
res/drawable/emotion_icon_06_popup.png [moved from PinyinIME/res/drawable/emotion_icon_06_popup.png with 100% similarity]
res/drawable/emotion_icon_10.png [moved from PinyinIME/res/drawable/emotion_icon_10.png with 100% similarity]
res/drawable/emotion_icon_10_popup.png [moved from PinyinIME/res/drawable/emotion_icon_10_popup.png with 100% similarity]
res/drawable/emotion_icon_11.png [moved from PinyinIME/res/drawable/emotion_icon_11.png with 100% similarity]
res/drawable/emotion_icon_11_popup.png [moved from PinyinIME/res/drawable/emotion_icon_11_popup.png with 100% similarity]
res/drawable/emotion_icon_12.png [moved from PinyinIME/res/drawable/emotion_icon_12.png with 100% similarity]
res/drawable/emotion_icon_12_popup.png [moved from PinyinIME/res/drawable/emotion_icon_12_popup.png with 100% similarity]
res/drawable/emotion_icon_13.png [moved from PinyinIME/res/drawable/emotion_icon_13.png with 100% similarity]
res/drawable/emotion_icon_13_popup.png [moved from PinyinIME/res/drawable/emotion_icon_13_popup.png with 100% similarity]
res/drawable/emotion_icon_14.png [moved from PinyinIME/res/drawable/emotion_icon_14.png with 100% similarity]
res/drawable/emotion_icon_14_popup.png [moved from PinyinIME/res/drawable/emotion_icon_14_popup.png with 100% similarity]
res/drawable/emotion_icon_15.png [moved from PinyinIME/res/drawable/emotion_icon_15.png with 100% similarity]
res/drawable/emotion_icon_15_popup.png [moved from PinyinIME/res/drawable/emotion_icon_15_popup.png with 100% similarity]
res/drawable/emotion_icon_16.png [moved from PinyinIME/res/drawable/emotion_icon_16.png with 100% similarity]
res/drawable/emotion_icon_16_popup.png [moved from PinyinIME/res/drawable/emotion_icon_16_popup.png with 100% similarity]
res/drawable/emotion_icon_20.png [moved from PinyinIME/res/drawable/emotion_icon_20.png with 100% similarity]
res/drawable/emotion_icon_20_popup.png [moved from PinyinIME/res/drawable/emotion_icon_20_popup.png with 100% similarity]
res/drawable/emotion_icon_21.png [moved from PinyinIME/res/drawable/emotion_icon_21.png with 100% similarity]
res/drawable/emotion_icon_21_popup.png [moved from PinyinIME/res/drawable/emotion_icon_21_popup.png with 100% similarity]
res/drawable/emotion_icon_22.png [moved from PinyinIME/res/drawable/emotion_icon_22.png with 100% similarity]
res/drawable/emotion_icon_22_popup.png [moved from PinyinIME/res/drawable/emotion_icon_22_popup.png with 100% similarity]
res/drawable/emotion_icon_23.png [moved from PinyinIME/res/drawable/emotion_icon_23.png with 100% similarity]
res/drawable/emotion_icon_23_popup.png [moved from PinyinIME/res/drawable/emotion_icon_23_popup.png with 100% similarity]
res/drawable/emotion_icon_24.png [moved from PinyinIME/res/drawable/emotion_icon_24.png with 100% similarity]
res/drawable/emotion_icon_24_popup.png [moved from PinyinIME/res/drawable/emotion_icon_24_popup.png with 100% similarity]
res/drawable/enter_icon.png [moved from PinyinIME/res/drawable/enter_icon.png with 100% similarity]
res/drawable/enter_popup_icon.png [moved from PinyinIME/res/drawable/enter_popup_icon.png with 100% similarity]
res/drawable/ime_en.png [moved from PinyinIME/res/drawable/ime_en.png with 100% similarity]
res/drawable/ime_pinyin.png [moved from PinyinIME/res/drawable/ime_pinyin.png with 100% similarity]
res/drawable/key_balloon_bg.9.png [moved from PinyinIME/res/drawable/key_balloon_bg.9.png with 100% similarity]
res/drawable/light_key_bg.9.png [moved from PinyinIME/res/drawable/light_key_bg.9.png with 100% similarity]
res/drawable/light_key_hl_bg.9.png [moved from PinyinIME/res/drawable/light_key_hl_bg.9.png with 100% similarity]
res/drawable/light_key_up_bg.9.png [moved from PinyinIME/res/drawable/light_key_up_bg.9.png with 100% similarity]
res/drawable/light_key_up_hl_bg.9.png [moved from PinyinIME/res/drawable/light_key_up_hl_bg.9.png with 100% similarity]
res/drawable/miniskb_bg.9.png [moved from PinyinIME/res/drawable/miniskb_bg.9.png with 100% similarity]
res/drawable/normal_key_bg.9.png [moved from PinyinIME/res/drawable/normal_key_bg.9.png with 100% similarity]
res/drawable/normal_key_hl_bg.9.png [moved from PinyinIME/res/drawable/normal_key_hl_bg.9.png with 100% similarity]
res/drawable/num0.png [moved from PinyinIME/res/drawable/num0.png with 100% similarity]
res/drawable/num1.png [moved from PinyinIME/res/drawable/num1.png with 100% similarity]
res/drawable/num2.png [moved from PinyinIME/res/drawable/num2.png with 100% similarity]
res/drawable/num3.png [moved from PinyinIME/res/drawable/num3.png with 100% similarity]
res/drawable/num4.png [moved from PinyinIME/res/drawable/num4.png with 100% similarity]
res/drawable/num5.png [moved from PinyinIME/res/drawable/num5.png with 100% similarity]
res/drawable/num6.png [moved from PinyinIME/res/drawable/num6.png with 100% similarity]
res/drawable/num7.png [moved from PinyinIME/res/drawable/num7.png with 100% similarity]
res/drawable/num8.png [moved from PinyinIME/res/drawable/num8.png with 100% similarity]
res/drawable/num9.png [moved from PinyinIME/res/drawable/num9.png with 100% similarity]
res/drawable/numalt.png [moved from PinyinIME/res/drawable/numalt.png with 100% similarity]
res/drawable/numpound.png [moved from PinyinIME/res/drawable/numpound.png with 100% similarity]
res/drawable/numstar.png [moved from PinyinIME/res/drawable/numstar.png with 100% similarity]
res/drawable/period_full_icon.png [moved from PinyinIME/res/drawable/period_full_icon.png with 100% similarity]
res/drawable/period_full_popup_icon.png [moved from PinyinIME/res/drawable/period_full_popup_icon.png with 100% similarity]
res/drawable/period_icon.png [moved from PinyinIME/res/drawable/period_icon.png with 100% similarity]
res/drawable/period_popup_icon.png [moved from PinyinIME/res/drawable/period_popup_icon.png with 100% similarity]
res/drawable/search_icon.png [moved from PinyinIME/res/drawable/search_icon.png with 100% similarity]
res/drawable/search_popup_icon.png [moved from PinyinIME/res/drawable/search_popup_icon.png with 100% similarity]
res/drawable/shift_off_icon.png [moved from PinyinIME/res/drawable/shift_off_icon.png with 100% similarity]
res/drawable/shift_off_popup_icon.png [moved from PinyinIME/res/drawable/shift_off_popup_icon.png with 100% similarity]
res/drawable/shift_on_icon.png [moved from PinyinIME/res/drawable/shift_on_icon.png with 100% similarity]
res/drawable/shift_on_popup_icon.png [moved from PinyinIME/res/drawable/shift_on_popup_icon.png with 100% similarity]
res/drawable/skb_bg.png [moved from PinyinIME/res/drawable/skb_bg.png with 100% similarity]
res/drawable/skb_container_bg.9.png [moved from PinyinIME/res/drawable/skb_container_bg.9.png with 100% similarity]
res/drawable/smiley_icon.png [moved from PinyinIME/res/drawable/smiley_icon.png with 100% similarity]
res/drawable/smiley_popup_icon.png [moved from PinyinIME/res/drawable/smiley_popup_icon.png with 100% similarity]
res/drawable/space_icon.png [moved from PinyinIME/res/drawable/space_icon.png with 100% similarity]
res/drawable/space_popup_icon.png [moved from PinyinIME/res/drawable/space_popup_icon.png with 100% similarity]
res/layout/candidates_container.xml [moved from PinyinIME/res/layout/candidates_container.xml with 100% similarity]
res/layout/floating_container.xml [moved from PinyinIME/res/layout/floating_container.xml with 100% similarity]
res/layout/skb_container.xml [moved from PinyinIME/res/layout/skb_container.xml with 100% similarity]
res/raw/dict_pinyin.dat [moved from PinyinIME/res/raw/dict_pinyin.dat with 100% similarity]
res/values-land/dimens.xml [moved from PinyinIME/res/values-land/dimens.xml with 100% similarity]
res/values-port/dimens.xml [moved from PinyinIME/res/values-port/dimens.xml with 100% similarity]
res/values-zh/bools.xml [moved from PinyinIME/res/values-zh/bools.xml with 100% similarity]
res/values/colors.xml [moved from PinyinIME/res/values/colors.xml with 100% similarity]
res/values/dimens.xml [moved from PinyinIME/res/values/dimens.xml with 100% similarity]
res/values/strings.xml [moved from PinyinIME/res/values/strings.xml with 100% similarity]
res/xml/method.xml [moved from PinyinIME/res/xml/method.xml with 100% similarity]
res/xml/settings.xml [moved from PinyinIME/res/xml/settings.xml with 100% similarity]
res/xml/skb_phone.xml [moved from PinyinIME/res/xml/skb_phone.xml with 100% similarity]
res/xml/skb_qwerty.xml [moved from PinyinIME/res/xml/skb_qwerty.xml with 100% similarity]
res/xml/skb_smiley.xml [moved from PinyinIME/res/xml/skb_smiley.xml with 100% similarity]
res/xml/skb_sym1.xml [moved from PinyinIME/res/xml/skb_sym1.xml with 100% similarity]
res/xml/skb_sym2.xml [moved from PinyinIME/res/xml/skb_sym2.xml with 100% similarity]
res/xml/skb_template1.xml [moved from PinyinIME/res/xml/skb_template1.xml with 100% similarity]
src/com/android/inputmethod/pinyin/BalloonHint.java [moved from PinyinIME/src/com/android/inputmethod/pinyin/BalloonHint.java with 100% similarity]
src/com/android/inputmethod/pinyin/CandidateView.java [moved from PinyinIME/src/com/android/inputmethod/pinyin/CandidateView.java with 100% similarity]
src/com/android/inputmethod/pinyin/CandidateViewListener.java [moved from PinyinIME/src/com/android/inputmethod/pinyin/CandidateViewListener.java with 100% similarity]
src/com/android/inputmethod/pinyin/CandidatesContainer.java [moved from PinyinIME/src/com/android/inputmethod/pinyin/CandidatesContainer.java with 100% similarity]
src/com/android/inputmethod/pinyin/ComposingView.java [moved from PinyinIME/src/com/android/inputmethod/pinyin/ComposingView.java with 99% similarity]
src/com/android/inputmethod/pinyin/EnglishInputProcessor.java [moved from PinyinIME/src/com/android/inputmethod/pinyin/EnglishInputProcessor.java with 100% similarity]
src/com/android/inputmethod/pinyin/Environment.java [moved from PinyinIME/src/com/android/inputmethod/pinyin/Environment.java with 100% similarity]
src/com/android/inputmethod/pinyin/InputModeSwitcher.java [moved from PinyinIME/src/com/android/inputmethod/pinyin/InputModeSwitcher.java with 97% similarity]
src/com/android/inputmethod/pinyin/KeyMapDream.java [moved from PinyinIME/src/com/android/inputmethod/pinyin/KeyMapDream.java with 100% similarity]
src/com/android/inputmethod/pinyin/PinyinDecoderService.java [moved from PinyinIME/src/com/android/inputmethod/pinyin/PinyinDecoderService.java with 100% similarity]
src/com/android/inputmethod/pinyin/PinyinIME.java [moved from PinyinIME/src/com/android/inputmethod/pinyin/PinyinIME.java with 95% similarity]
src/com/android/inputmethod/pinyin/Settings.java [moved from PinyinIME/src/com/android/inputmethod/pinyin/Settings.java with 100% similarity]
src/com/android/inputmethod/pinyin/SettingsActivity.java [moved from PinyinIME/src/com/android/inputmethod/pinyin/SettingsActivity.java with 100% similarity]
src/com/android/inputmethod/pinyin/SkbContainer.java [moved from PinyinIME/src/com/android/inputmethod/pinyin/SkbContainer.java with 100% similarity]
src/com/android/inputmethod/pinyin/SkbPool.java [moved from PinyinIME/src/com/android/inputmethod/pinyin/SkbPool.java with 100% similarity]
src/com/android/inputmethod/pinyin/SkbTemplate.java [moved from PinyinIME/src/com/android/inputmethod/pinyin/SkbTemplate.java with 100% similarity]
src/com/android/inputmethod/pinyin/SoftKey.java [moved from PinyinIME/src/com/android/inputmethod/pinyin/SoftKey.java with 100% similarity]
src/com/android/inputmethod/pinyin/SoftKeyToggle.java [moved from PinyinIME/src/com/android/inputmethod/pinyin/SoftKeyToggle.java with 100% similarity]
src/com/android/inputmethod/pinyin/SoftKeyboard.java [moved from PinyinIME/src/com/android/inputmethod/pinyin/SoftKeyboard.java with 100% similarity]
src/com/android/inputmethod/pinyin/SoftKeyboardView.java [moved from PinyinIME/src/com/android/inputmethod/pinyin/SoftKeyboardView.java with 100% similarity]
src/com/android/inputmethod/pinyin/SoundManager.java [moved from PinyinIME/src/com/android/inputmethod/pinyin/SoundManager.java with 100% similarity]
src/com/android/inputmethod/pinyin/XmlKeyboardLoader.java [moved from PinyinIME/src/com/android/inputmethod/pinyin/XmlKeyboardLoader.java with 100% similarity]