git.osdn.net Git - android-x86/packages-apps-Contacts.git/commit

(root) / android-x86 / packages-apps-Contacts.git / commit

author	Android Git Automerger <android-git-automerger@android.com>
	Thu, 1 Oct 2009 22:03:36 +0000 (15:03 -0700)
committer	Android Git Automerger <android-git-automerger@android.com>
	Thu, 1 Oct 2009 22:03:36 +0000 (15:03 -0700)
commit	bfef6d76a349f27b6a72e45712afb1f2b1b376e7
tree	fc4819d8933524b0884cc6e4e5b26912d47dd60a	tree \| snapshot
parent	55a79b8951098dcaace1908e1bc1364faa1f7c08	commit \| diff

merge 2644e0f33eac0ab861657bddb824d007e1c6a2d1 except for the res/values-* translation files

65 files changed:

AndroidManifest.xml		diff \| blob \| history
res/anim/quickcontact.xml	[moved from res/anim/fasttrack.xml with 100% similarity]	blob \| history
res/anim/quickcontact_above_enter.xml	[moved from res/anim/fasttrack_above_enter.xml with 100% similarity]	blob \| history
res/anim/quickcontact_above_exit.xml	[moved from res/anim/fasttrack_above_exit.xml with 100% similarity]	blob \| history
res/anim/quickcontact_below_enter.xml	[moved from res/anim/fasttrack_below_enter.xml with 100% similarity]	blob \| history
res/anim/quickcontact_below_exit.xml	[moved from res/anim/fasttrack_below_exit.xml with 100% similarity]	blob \| history
res/drawable-finger/quickcontact_disambig_checkbox.xml	[moved from res/drawable-finger/fasttrack_disambig_checkbox.xml with 84% similarity]	diff \| blob \| history
res/drawable-finger/quickcontact_slider_btn.xml	[moved from res/drawable-finger/fasttrack_slider_btn.xml with 72% similarity]	diff \| blob \| history
res/drawable-hdpi-finger/quickcontact_arrow_down.png	[moved from res/drawable-hdpi-finger/fasttrack_arrow_down.png with 100% similarity]	blob \| history
res/drawable-hdpi-finger/quickcontact_arrow_up.png	[moved from res/drawable-hdpi-finger/fasttrack_arrow_up.png with 100% similarity]	blob \| history
res/drawable-hdpi-finger/quickcontact_bottom_frame.9.png	[moved from res/drawable-hdpi-finger/fasttrack_bottom_frame.9.png with 100% similarity]	blob \| history
res/drawable-hdpi-finger/quickcontact_disambig_bottom_bg.9.png	[moved from res/drawable-hdpi-finger/fasttrack_disambig_bottom_bg.9.png with 100% similarity]	blob \| history
res/drawable-hdpi-finger/quickcontact_disambig_checkbox_off.png	[moved from res/drawable-hdpi-finger/fasttrack_disambig_checkbox_off.png with 100% similarity]	blob \| history
res/drawable-hdpi-finger/quickcontact_disambig_checkbox_on.png	[moved from res/drawable-hdpi-finger/fasttrack_disambig_checkbox_on.png with 100% similarity]	blob \| history
res/drawable-hdpi-finger/quickcontact_disambig_divider.9.png	[moved from res/drawable-hdpi-finger/fasttrack_disambig_divider.9.png with 100% similarity]	blob \| history
res/drawable-hdpi-finger/quickcontact_drop_shadow.9.png	[moved from res/drawable-hdpi-finger/fasttrack_drop_shadow.9.png with 100% similarity]	blob \| history
res/drawable-hdpi-finger/quickcontact_frame_divider_med.png	[moved from res/drawable-hdpi-finger/fasttrack_frame_divider_med.png with 100% similarity]	blob \| history
res/drawable-hdpi-finger/quickcontact_slider_background.png	[moved from res/drawable-hdpi-finger/fasttrack_slider_background.png with 100% similarity]	blob \| history
res/drawable-hdpi-finger/quickcontact_slider_btn_normal.9.png	[moved from res/drawable-hdpi-finger/fasttrack_slider_btn_normal.9.png with 100% similarity]	blob \| history
res/drawable-hdpi-finger/quickcontact_slider_btn_on.9.png	[moved from res/drawable-hdpi-finger/fasttrack_slider_btn_on.9.png with 100% similarity]	blob \| history
res/drawable-hdpi-finger/quickcontact_slider_btn_pressed.9.png	[moved from res/drawable-hdpi-finger/fasttrack_slider_btn_pressed.9.png with 100% similarity]	blob \| history
res/drawable-hdpi-finger/quickcontact_slider_btn_selected.9.png	[moved from res/drawable-hdpi-finger/fasttrack_slider_btn_selected.9.png with 100% similarity]	blob \| history
res/drawable-hdpi-finger/quickcontact_slider_grip_left.png	[moved from res/drawable-hdpi-finger/fasttrack_slider_grip_left.png with 100% similarity]	blob \| history
res/drawable-hdpi-finger/quickcontact_slider_grip_right.png	[moved from res/drawable-hdpi-finger/fasttrack_slider_grip_right.png with 100% similarity]	blob \| history
res/drawable-hdpi-finger/quickcontact_slider_presence_active.png	[moved from res/drawable-hdpi-finger/fasttrack_slider_presence_active.png with 100% similarity]	blob \| history
res/drawable-hdpi-finger/quickcontact_slider_presence_away.png	[moved from res/drawable-hdpi-finger/fasttrack_slider_presence_away.png with 100% similarity]	blob \| history
res/drawable-hdpi-finger/quickcontact_slider_presence_busy.png	[moved from res/drawable-hdpi-finger/fasttrack_slider_presence_busy.png with 100% similarity]	blob \| history
res/drawable-hdpi-finger/quickcontact_slider_presence_inactive.png	[moved from res/drawable-hdpi-finger/fasttrack_slider_presence_inactive.png with 100% similarity]	blob \| history
res/drawable-hdpi-finger/quickcontact_top_frame.9.png	[moved from res/drawable-hdpi-finger/fasttrack_top_frame.9.png with 100% similarity]	blob \| history
res/drawable-mdpi-finger/quickcontact_arrow_down.png	[moved from res/drawable-mdpi-finger/fasttrack_arrow_down.png with 100% similarity]	blob \| history
res/drawable-mdpi-finger/quickcontact_arrow_up.png	[moved from res/drawable-mdpi-finger/fasttrack_arrow_up.png with 100% similarity]	blob \| history
res/drawable-mdpi-finger/quickcontact_bottom_frame.9.png	[moved from res/drawable-mdpi-finger/fasttrack_bottom_frame.9.png with 100% similarity]	blob \| history
res/drawable-mdpi-finger/quickcontact_disambig_bottom_bg.9.png	[moved from res/drawable-mdpi-finger/fasttrack_disambig_bottom_bg.9.png with 100% similarity]	blob \| history
res/drawable-mdpi-finger/quickcontact_disambig_checkbox_off.png	[moved from res/drawable-mdpi-finger/fasttrack_disambig_checkbox_off.png with 100% similarity]	blob \| history
res/drawable-mdpi-finger/quickcontact_disambig_checkbox_on.png	[moved from res/drawable-mdpi-finger/fasttrack_disambig_checkbox_on.png with 100% similarity]	blob \| history
res/drawable-mdpi-finger/quickcontact_disambig_divider.9.png	[moved from res/drawable-mdpi-finger/fasttrack_disambig_divider.9.png with 100% similarity]	blob \| history
res/drawable-mdpi-finger/quickcontact_drop_shadow.9.png	[moved from res/drawable-mdpi-finger/fasttrack_drop_shadow.9.png with 100% similarity]	blob \| history
res/drawable-mdpi-finger/quickcontact_frame_divider_med.png	[moved from res/drawable-mdpi-finger/fasttrack_frame_divider_med.png with 100% similarity]	blob \| history
res/drawable-mdpi-finger/quickcontact_slider_background.png	[moved from res/drawable-mdpi-finger/fasttrack_slider_background.png with 100% similarity]	blob \| history
res/drawable-mdpi-finger/quickcontact_slider_btn_normal.9.png	[moved from res/drawable-mdpi-finger/fasttrack_slider_btn_normal.9.png with 100% similarity]	blob \| history
res/drawable-mdpi-finger/quickcontact_slider_btn_on.9.png	[moved from res/drawable-mdpi-finger/fasttrack_slider_btn_on.9.png with 100% similarity]	blob \| history
res/drawable-mdpi-finger/quickcontact_slider_btn_pressed.9.png	[moved from res/drawable-mdpi-finger/fasttrack_slider_btn_pressed.9.png with 100% similarity]	blob \| history
res/drawable-mdpi-finger/quickcontact_slider_btn_selected.9.png	[moved from res/drawable-mdpi-finger/fasttrack_slider_btn_selected.9.png with 100% similarity]	blob \| history
res/drawable-mdpi-finger/quickcontact_slider_grip_left.png	[moved from res/drawable-mdpi-finger/fasttrack_slider_grip_left.png with 100% similarity]	blob \| history
res/drawable-mdpi-finger/quickcontact_slider_grip_right.png	[moved from res/drawable-mdpi-finger/fasttrack_slider_grip_right.png with 100% similarity]	blob \| history
res/drawable-mdpi-finger/quickcontact_slider_presence_active.png	[moved from res/drawable-mdpi-finger/fasttrack_slider_presence_active.png with 100% similarity]	blob \| history
res/drawable-mdpi-finger/quickcontact_slider_presence_away.png	[moved from res/drawable-mdpi-finger/fasttrack_slider_presence_away.png with 100% similarity]	blob \| history
res/drawable-mdpi-finger/quickcontact_slider_presence_busy.png	[moved from res/drawable-mdpi-finger/fasttrack_slider_presence_busy.png with 100% similarity]	blob \| history
res/drawable-mdpi-finger/quickcontact_slider_presence_inactive.png	[moved from res/drawable-mdpi-finger/fasttrack_slider_presence_inactive.png with 100% similarity]	blob \| history
res/drawable-mdpi-finger/quickcontact_top_frame.9.png	[moved from res/drawable-mdpi-finger/fasttrack_top_frame.9.png with 100% similarity]	blob \| history
res/drawable/quickcontact.9.png	[moved from res/drawable/fasttrack.9.png with 100% similarity]	blob \| history
res/layout-finger/quickcontact.xml	[moved from res/layout-finger/fasttrack.xml with 79% similarity]	diff \| blob \| history
res/layout-finger/quickcontact_header_large.xml	[moved from res/layout-finger/fasttrack_header_large.xml with 94% similarity]	diff \| blob \| history
res/layout-finger/quickcontact_header_med.xml	[moved from res/layout-finger/fasttrack_header_med.xml with 93% similarity]	diff \| blob \| history
res/layout-finger/quickcontact_header_small.xml	[moved from res/layout-finger/fasttrack_header_small.xml with 93% similarity]	diff \| blob \| history
res/layout-finger/quickcontact_item.xml	[moved from res/layout-finger/fasttrack_item.xml with 94% similarity]	diff \| blob \| history
res/layout-finger/quickcontact_resolve_item.xml	[moved from res/layout-finger/fasttrack_resolve_item.xml with 100% similarity]	blob \| history
res/values/colors.xml		diff \| blob \| history
res/values/dimens.xml		diff \| blob \| history
res/values/strings.xml		diff \| blob \| history
res/values/styles.xml		diff \| blob \| history
src/com/android/contacts/ContactsListActivity.java		diff \| blob \| history
src/com/android/contacts/ui/QuickContactActivity.java	[moved from src/com/android/contacts/ui/FastTrackActivity.java with 61% similarity]	diff \| blob \| history
src/com/android/contacts/ui/QuickContactWindow.java	[moved from src/com/android/contacts/ui/FastTrackWindow.java with 95% similarity]	diff \| blob \| history
src/com/android/contacts/ui/widget/CheckableImageView.java		diff \| blob \| history

packages/apps/Contacts

RSS Atom

About OSDN

Find Software

Develop Software

Help