d33f2e4bf1660146f1d9610f48975d66f638126c - platform/packages/inputmethods/PinyinIME

commit	d33f2e4bf1660146f1d9610f48975d66f638126c	[log] [tgz]
author	The Android Open Source Project <initial-contribution@android.com>	Sun Mar 29 21:52:42 2009 -0700
committer	The Android Open Source Project <initial-contribution@android.com>	Sun Mar 29 21:52:42 2009 -0700
tree	fb2ac65c09f25b378e006c891113a3fefe149142
parent	7898d76cc005bbe1c5893a9f57439561e0771cc8 [diff]

reconciled

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

182 files changed

tree: fb2ac65c09f25b378e006c891113a3fefe149142