From bfef6d76a349f27b6a72e45712afb1f2b1b376e7 Mon Sep 17 00:00:00 2001
From: Android Git Automerger <android-git-automerger@android.com>
Date: Thu, 1 Oct 2009 15:03:36 -0700
Subject: [PATCH] merge 2644e0f33eac0ab861657bddb824d007e1c6a2d1 except for the
 res/values-* translation files

---
 AndroidManifest.xml                                |   6 +-
 res/anim/{fasttrack.xml => quickcontact.xml}       |   0
 ...bove_enter.xml => quickcontact_above_enter.xml} |   0
 ..._above_exit.xml => quickcontact_above_exit.xml} |   0
 ...elow_enter.xml => quickcontact_below_enter.xml} |   0
 ..._below_exit.xml => quickcontact_below_exit.xml} |   0
 ...kbox.xml => quickcontact_disambig_checkbox.xml} |   4 +-
 ..._slider_btn.xml => quickcontact_slider_btn.xml} |  10 ++--
 ..._arrow_down.png => quickcontact_arrow_down.png} | Bin
 ...rack_arrow_up.png => quickcontact_arrow_up.png} | Bin
 ...frame.9.png => quickcontact_bottom_frame.9.png} | Bin
 ...9.png => quickcontact_disambig_bottom_bg.9.png} | Bin
 ....png => quickcontact_disambig_checkbox_off.png} | Bin
 ...n.png => quickcontact_disambig_checkbox_on.png} | Bin
 ...r.9.png => quickcontact_disambig_divider.9.png} | Bin
 ...shadow.9.png => quickcontact_drop_shadow.9.png} | Bin
 ..._med.png => quickcontact_frame_divider_med.png} | Bin
 ...ound.png => quickcontact_slider_background.png} | Bin
 ....9.png => quickcontact_slider_btn_normal.9.png} | Bin
 ...n_on.9.png => quickcontact_slider_btn_on.9.png} | Bin
 ...9.png => quickcontact_slider_btn_pressed.9.png} | Bin
 ....png => quickcontact_slider_btn_selected.9.png} | Bin
 ..._left.png => quickcontact_slider_grip_left.png} | Bin
 ...ight.png => quickcontact_slider_grip_right.png} | Bin
 ...png => quickcontact_slider_presence_active.png} | Bin
 ...y.png => quickcontact_slider_presence_away.png} | Bin
 ...y.png => quickcontact_slider_presence_busy.png} | Bin
 ...g => quickcontact_slider_presence_inactive.png} | Bin
 ...op_frame.9.png => quickcontact_top_frame.9.png} | Bin
 ..._arrow_down.png => quickcontact_arrow_down.png} | Bin
 ...rack_arrow_up.png => quickcontact_arrow_up.png} | Bin
 ...frame.9.png => quickcontact_bottom_frame.9.png} | Bin
 ...9.png => quickcontact_disambig_bottom_bg.9.png} | Bin
 ....png => quickcontact_disambig_checkbox_off.png} | Bin
 ...n.png => quickcontact_disambig_checkbox_on.png} | Bin
 ...r.9.png => quickcontact_disambig_divider.9.png} | Bin
 ...shadow.9.png => quickcontact_drop_shadow.9.png} | Bin
 ..._med.png => quickcontact_frame_divider_med.png} | Bin
 ...ound.png => quickcontact_slider_background.png} | Bin
 ....9.png => quickcontact_slider_btn_normal.9.png} | Bin
 ...n_on.9.png => quickcontact_slider_btn_on.9.png} | Bin
 ...9.png => quickcontact_slider_btn_pressed.9.png} | Bin
 ....png => quickcontact_slider_btn_selected.9.png} | Bin
 ..._left.png => quickcontact_slider_grip_left.png} | Bin
 ...ight.png => quickcontact_slider_grip_right.png} | Bin
 ...png => quickcontact_slider_presence_active.png} | Bin
 ...y.png => quickcontact_slider_presence_away.png} | Bin
 ...y.png => quickcontact_slider_presence_busy.png} | Bin
 ...g => quickcontact_slider_presence_inactive.png} | Bin
 ...op_frame.9.png => quickcontact_top_frame.9.png} | Bin
 .../{fasttrack.9.png => quickcontact.9.png}        | Bin
 .../{fasttrack.xml => quickcontact.xml}            |  32 +++++------
 ...der_large.xml => quickcontact_header_large.xml} |   4 +-
 ..._header_med.xml => quickcontact_header_med.xml} |   4 +-
 ...der_small.xml => quickcontact_header_small.xml} |   2 +-
 .../{fasttrack_item.xml => quickcontact_item.xml}  |   2 +-
 ...olve_item.xml => quickcontact_resolve_item.xml} |   0
 res/values/colors.xml                              |   4 +-
 res/values/dimens.xml                              |   2 +-
 res/values/strings.xml                             |   6 +-
 res/values/styles.xml                              |  18 +++---
 src/com/android/contacts/ContactsListActivity.java |  30 +++++-----
 ...rackActivity.java => QuickContactActivity.java} |  27 ++++-----
 ...astTrackWindow.java => QuickContactWindow.java} |  61 +++++++++++----------
 .../contacts/ui/widget/CheckableImageView.java     |   2 +-
 65 files changed, 109 insertions(+), 105 deletions(-)
 rename res/anim/{fasttrack.xml => quickcontact.xml} (100%)
 rename res/anim/{fasttrack_above_enter.xml => quickcontact_above_enter.xml} (100%)
 rename res/anim/{fasttrack_above_exit.xml => quickcontact_above_exit.xml} (100%)
 rename res/anim/{fasttrack_below_enter.xml => quickcontact_below_enter.xml} (100%)
 rename res/anim/{fasttrack_below_exit.xml => quickcontact_below_exit.xml} (100%)
 rename res/drawable-finger/{fasttrack_disambig_checkbox.xml => quickcontact_disambig_checkbox.xml} (84%)
 rename res/drawable-finger/{fasttrack_slider_btn.xml => quickcontact_slider_btn.xml} (72%)
 rename res/drawable-hdpi-finger/{fasttrack_arrow_down.png => quickcontact_arrow_down.png} (100%)
 rename res/drawable-hdpi-finger/{fasttrack_arrow_up.png => quickcontact_arrow_up.png} (100%)
 rename res/drawable-hdpi-finger/{fasttrack_bottom_frame.9.png => quickcontact_bottom_frame.9.png} (100%)
 rename res/drawable-hdpi-finger/{fasttrack_disambig_bottom_bg.9.png => quickcontact_disambig_bottom_bg.9.png} (100%)
 rename res/drawable-hdpi-finger/{fasttrack_disambig_checkbox_off.png => quickcontact_disambig_checkbox_off.png} (100%)
 rename res/drawable-hdpi-finger/{fasttrack_disambig_checkbox_on.png => quickcontact_disambig_checkbox_on.png} (100%)
 rename res/drawable-hdpi-finger/{fasttrack_disambig_divider.9.png => quickcontact_disambig_divider.9.png} (100%)
 rename res/drawable-hdpi-finger/{fasttrack_drop_shadow.9.png => quickcontact_drop_shadow.9.png} (100%)
 rename res/drawable-hdpi-finger/{fasttrack_frame_divider_med.png => quickcontact_frame_divider_med.png} (100%)
 rename res/drawable-hdpi-finger/{fasttrack_slider_background.png => quickcontact_slider_background.png} (100%)
 rename res/drawable-hdpi-finger/{fasttrack_slider_btn_normal.9.png => quickcontact_slider_btn_normal.9.png} (100%)
 rename res/drawable-hdpi-finger/{fasttrack_slider_btn_on.9.png => quickcontact_slider_btn_on.9.png} (100%)
 rename res/drawable-hdpi-finger/{fasttrack_slider_btn_pressed.9.png => quickcontact_slider_btn_pressed.9.png} (100%)
 rename res/drawable-hdpi-finger/{fasttrack_slider_btn_selected.9.png => quickcontact_slider_btn_selected.9.png} (100%)
 rename res/drawable-hdpi-finger/{fasttrack_slider_grip_left.png => quickcontact_slider_grip_left.png} (100%)
 rename res/drawable-hdpi-finger/{fasttrack_slider_grip_right.png => quickcontact_slider_grip_right.png} (100%)
 rename res/drawable-hdpi-finger/{fasttrack_slider_presence_active.png => quickcontact_slider_presence_active.png} (100%)
 rename res/drawable-hdpi-finger/{fasttrack_slider_presence_away.png => quickcontact_slider_presence_away.png} (100%)
 rename res/drawable-hdpi-finger/{fasttrack_slider_presence_busy.png => quickcontact_slider_presence_busy.png} (100%)
 rename res/drawable-hdpi-finger/{fasttrack_slider_presence_inactive.png => quickcontact_slider_presence_inactive.png} (100%)
 rename res/drawable-hdpi-finger/{fasttrack_top_frame.9.png => quickcontact_top_frame.9.png} (100%)
 rename res/drawable-mdpi-finger/{fasttrack_arrow_down.png => quickcontact_arrow_down.png} (100%)
 rename res/drawable-mdpi-finger/{fasttrack_arrow_up.png => quickcontact_arrow_up.png} (100%)
 rename res/drawable-mdpi-finger/{fasttrack_bottom_frame.9.png => quickcontact_bottom_frame.9.png} (100%)
 rename res/drawable-mdpi-finger/{fasttrack_disambig_bottom_bg.9.png => quickcontact_disambig_bottom_bg.9.png} (100%)
 rename res/drawable-mdpi-finger/{fasttrack_disambig_checkbox_off.png => quickcontact_disambig_checkbox_off.png} (100%)
 rename res/drawable-mdpi-finger/{fasttrack_disambig_checkbox_on.png => quickcontact_disambig_checkbox_on.png} (100%)
 rename res/drawable-mdpi-finger/{fasttrack_disambig_divider.9.png => quickcontact_disambig_divider.9.png} (100%)
 rename res/drawable-mdpi-finger/{fasttrack_drop_shadow.9.png => quickcontact_drop_shadow.9.png} (100%)
 rename res/drawable-mdpi-finger/{fasttrack_frame_divider_med.png => quickcontact_frame_divider_med.png} (100%)
 rename res/drawable-mdpi-finger/{fasttrack_slider_background.png => quickcontact_slider_background.png} (100%)
 rename res/drawable-mdpi-finger/{fasttrack_slider_btn_normal.9.png => quickcontact_slider_btn_normal.9.png} (100%)
 rename res/drawable-mdpi-finger/{fasttrack_slider_btn_on.9.png => quickcontact_slider_btn_on.9.png} (100%)
 rename res/drawable-mdpi-finger/{fasttrack_slider_btn_pressed.9.png => quickcontact_slider_btn_pressed.9.png} (100%)
 rename res/drawable-mdpi-finger/{fasttrack_slider_btn_selected.9.png => quickcontact_slider_btn_selected.9.png} (100%)
 rename res/drawable-mdpi-finger/{fasttrack_slider_grip_left.png => quickcontact_slider_grip_left.png} (100%)
 rename res/drawable-mdpi-finger/{fasttrack_slider_grip_right.png => quickcontact_slider_grip_right.png} (100%)
 rename res/drawable-mdpi-finger/{fasttrack_slider_presence_active.png => quickcontact_slider_presence_active.png} (100%)
 rename res/drawable-mdpi-finger/{fasttrack_slider_presence_away.png => quickcontact_slider_presence_away.png} (100%)
 rename res/drawable-mdpi-finger/{fasttrack_slider_presence_busy.png => quickcontact_slider_presence_busy.png} (100%)
 rename res/drawable-mdpi-finger/{fasttrack_slider_presence_inactive.png => quickcontact_slider_presence_inactive.png} (100%)
 rename res/drawable-mdpi-finger/{fasttrack_top_frame.9.png => quickcontact_top_frame.9.png} (100%)
 rename res/drawable/{fasttrack.9.png => quickcontact.9.png} (100%)
 rename res/layout-finger/{fasttrack.xml => quickcontact.xml} (79%)
 rename res/layout-finger/{fasttrack_header_large.xml => quickcontact_header_large.xml} (94%)
 rename res/layout-finger/{fasttrack_header_med.xml => quickcontact_header_med.xml} (93%)
 rename res/layout-finger/{fasttrack_header_small.xml => quickcontact_header_small.xml} (93%)
 rename res/layout-finger/{fasttrack_item.xml => quickcontact_item.xml} (94%)
 rename res/layout-finger/{fasttrack_resolve_item.xml => quickcontact_resolve_item.xml} (100%)
 rename src/com/android/contacts/ui/{FastTrackActivity.java => QuickContactActivity.java} (61%)
 rename src/com/android/contacts/ui/{FastTrackWindow.java => QuickContactWindow.java} (95%)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index d3a474b..0950ff0 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -261,11 +261,11 @@
             </intent-filter>
         </activity>
 
-        <!-- Used to show FastTrack window over a translucent activity, which is a
+        <!-- Used to show QuickContact window over a translucent activity, which is a
              temporary hack until we add better framework support. -->
         <activity
-            android:name=".ui.FastTrackActivity"
-            android:theme="@style/FullyTranslucent.FastTrack">
+            android:name=".ui.QuickContactActivity"
+            android:theme="@style/FullyTranslucent.QuickContact">
 
             <intent-filter>
                 <action android:name="com.android.contacts.action.QUICK_CONTACT" />
diff --git a/res/anim/fasttrack.xml b/res/anim/quickcontact.xml
similarity index 100%
rename from res/anim/fasttrack.xml
rename to res/anim/quickcontact.xml
diff --git a/res/anim/fasttrack_above_enter.xml b/res/anim/quickcontact_above_enter.xml
similarity index 100%
rename from res/anim/fasttrack_above_enter.xml
rename to res/anim/quickcontact_above_enter.xml
diff --git a/res/anim/fasttrack_above_exit.xml b/res/anim/quickcontact_above_exit.xml
similarity index 100%
rename from res/anim/fasttrack_above_exit.xml
rename to res/anim/quickcontact_above_exit.xml
diff --git a/res/anim/fasttrack_below_enter.xml b/res/anim/quickcontact_below_enter.xml
similarity index 100%
rename from res/anim/fasttrack_below_enter.xml
rename to res/anim/quickcontact_below_enter.xml
diff --git a/res/anim/fasttrack_below_exit.xml b/res/anim/quickcontact_below_exit.xml
similarity index 100%
rename from res/anim/fasttrack_below_exit.xml
rename to res/anim/quickcontact_below_exit.xml
diff --git a/res/drawable-finger/fasttrack_disambig_checkbox.xml b/res/drawable-finger/quickcontact_disambig_checkbox.xml
similarity index 84%
rename from res/drawable-finger/fasttrack_disambig_checkbox.xml
rename to res/drawable-finger/quickcontact_disambig_checkbox.xml
index 0bd2030..4add69c 100644
--- a/res/drawable-finger/fasttrack_disambig_checkbox.xml
+++ b/res/drawable-finger/quickcontact_disambig_checkbox.xml
@@ -18,8 +18,8 @@
     android:dither="true">
 
     <item android:state_checked="true"
-        android:drawable="@drawable/fasttrack_disambig_checkbox_on" />
+        android:drawable="@drawable/quickcontact_disambig_checkbox_on" />
     <item
-        android:drawable="@drawable/fasttrack_disambig_checkbox_off" />
+        android:drawable="@drawable/quickcontact_disambig_checkbox_off" />
 
 </selector>
diff --git a/res/drawable-finger/fasttrack_slider_btn.xml b/res/drawable-finger/quickcontact_slider_btn.xml
similarity index 72%
rename from res/drawable-finger/fasttrack_slider_btn.xml
rename to res/drawable-finger/quickcontact_slider_btn.xml
index b89a543..a1be8f4 100644
--- a/res/drawable-finger/fasttrack_slider_btn.xml
+++ b/res/drawable-finger/quickcontact_slider_btn.xml
@@ -18,14 +18,14 @@
     android:dither="true">
 
     <item android:state_checked="true"
-        android:drawable="@drawable/fasttrack_slider_btn_on" />
+        android:drawable="@drawable/quickcontact_slider_btn_on" />
     <item android:state_window_focused="false"
-        android:drawable="@drawable/fasttrack_slider_btn_normal" />
+        android:drawable="@drawable/quickcontact_slider_btn_normal" />
     <item android:state_pressed="true"
-        android:drawable="@drawable/fasttrack_slider_btn_pressed" />
+        android:drawable="@drawable/quickcontact_slider_btn_pressed" />
     <item android:state_focused="true"
-        android:drawable="@drawable/fasttrack_slider_btn_selected" />
+        android:drawable="@drawable/quickcontact_slider_btn_selected" />
     <item
-        android:drawable="@drawable/fasttrack_slider_btn_normal" />
+        android:drawable="@drawable/quickcontact_slider_btn_normal" />
 
 </selector>
diff --git a/res/drawable-hdpi-finger/fasttrack_arrow_down.png b/res/drawable-hdpi-finger/quickcontact_arrow_down.png
similarity index 100%
rename from res/drawable-hdpi-finger/fasttrack_arrow_down.png
rename to res/drawable-hdpi-finger/quickcontact_arrow_down.png
diff --git a/res/drawable-hdpi-finger/fasttrack_arrow_up.png b/res/drawable-hdpi-finger/quickcontact_arrow_up.png
similarity index 100%
rename from res/drawable-hdpi-finger/fasttrack_arrow_up.png
rename to res/drawable-hdpi-finger/quickcontact_arrow_up.png
diff --git a/res/drawable-hdpi-finger/fasttrack_bottom_frame.9.png b/res/drawable-hdpi-finger/quickcontact_bottom_frame.9.png
similarity index 100%
rename from res/drawable-hdpi-finger/fasttrack_bottom_frame.9.png
rename to res/drawable-hdpi-finger/quickcontact_bottom_frame.9.png
diff --git a/res/drawable-hdpi-finger/fasttrack_disambig_bottom_bg.9.png b/res/drawable-hdpi-finger/quickcontact_disambig_bottom_bg.9.png
similarity index 100%
rename from res/drawable-hdpi-finger/fasttrack_disambig_bottom_bg.9.png
rename to res/drawable-hdpi-finger/quickcontact_disambig_bottom_bg.9.png
diff --git a/res/drawable-hdpi-finger/fasttrack_disambig_checkbox_off.png b/res/drawable-hdpi-finger/quickcontact_disambig_checkbox_off.png
similarity index 100%
rename from res/drawable-hdpi-finger/fasttrack_disambig_checkbox_off.png
rename to res/drawable-hdpi-finger/quickcontact_disambig_checkbox_off.png
diff --git a/res/drawable-hdpi-finger/fasttrack_disambig_checkbox_on.png b/res/drawable-hdpi-finger/quickcontact_disambig_checkbox_on.png
similarity index 100%
rename from res/drawable-hdpi-finger/fasttrack_disambig_checkbox_on.png
rename to res/drawable-hdpi-finger/quickcontact_disambig_checkbox_on.png
diff --git a/res/drawable-hdpi-finger/fasttrack_disambig_divider.9.png b/res/drawable-hdpi-finger/quickcontact_disambig_divider.9.png
similarity index 100%
rename from res/drawable-hdpi-finger/fasttrack_disambig_divider.9.png
rename to res/drawable-hdpi-finger/quickcontact_disambig_divider.9.png
diff --git a/res/drawable-hdpi-finger/fasttrack_drop_shadow.9.png b/res/drawable-hdpi-finger/quickcontact_drop_shadow.9.png
similarity index 100%
rename from res/drawable-hdpi-finger/fasttrack_drop_shadow.9.png
rename to res/drawable-hdpi-finger/quickcontact_drop_shadow.9.png
diff --git a/res/drawable-hdpi-finger/fasttrack_frame_divider_med.png b/res/drawable-hdpi-finger/quickcontact_frame_divider_med.png
similarity index 100%
rename from res/drawable-hdpi-finger/fasttrack_frame_divider_med.png
rename to res/drawable-hdpi-finger/quickcontact_frame_divider_med.png
diff --git a/res/drawable-hdpi-finger/fasttrack_slider_background.png b/res/drawable-hdpi-finger/quickcontact_slider_background.png
similarity index 100%
rename from res/drawable-hdpi-finger/fasttrack_slider_background.png
rename to res/drawable-hdpi-finger/quickcontact_slider_background.png
diff --git a/res/drawable-hdpi-finger/fasttrack_slider_btn_normal.9.png b/res/drawable-hdpi-finger/quickcontact_slider_btn_normal.9.png
similarity index 100%
rename from res/drawable-hdpi-finger/fasttrack_slider_btn_normal.9.png
rename to res/drawable-hdpi-finger/quickcontact_slider_btn_normal.9.png
diff --git a/res/drawable-hdpi-finger/fasttrack_slider_btn_on.9.png b/res/drawable-hdpi-finger/quickcontact_slider_btn_on.9.png
similarity index 100%
rename from res/drawable-hdpi-finger/fasttrack_slider_btn_on.9.png
rename to res/drawable-hdpi-finger/quickcontact_slider_btn_on.9.png
diff --git a/res/drawable-hdpi-finger/fasttrack_slider_btn_pressed.9.png b/res/drawable-hdpi-finger/quickcontact_slider_btn_pressed.9.png
similarity index 100%
rename from res/drawable-hdpi-finger/fasttrack_slider_btn_pressed.9.png
rename to res/drawable-hdpi-finger/quickcontact_slider_btn_pressed.9.png
diff --git a/res/drawable-hdpi-finger/fasttrack_slider_btn_selected.9.png b/res/drawable-hdpi-finger/quickcontact_slider_btn_selected.9.png
similarity index 100%
rename from res/drawable-hdpi-finger/fasttrack_slider_btn_selected.9.png
rename to res/drawable-hdpi-finger/quickcontact_slider_btn_selected.9.png
diff --git a/res/drawable-hdpi-finger/fasttrack_slider_grip_left.png b/res/drawable-hdpi-finger/quickcontact_slider_grip_left.png
similarity index 100%
rename from res/drawable-hdpi-finger/fasttrack_slider_grip_left.png
rename to res/drawable-hdpi-finger/quickcontact_slider_grip_left.png
diff --git a/res/drawable-hdpi-finger/fasttrack_slider_grip_right.png b/res/drawable-hdpi-finger/quickcontact_slider_grip_right.png
similarity index 100%
rename from res/drawable-hdpi-finger/fasttrack_slider_grip_right.png
rename to res/drawable-hdpi-finger/quickcontact_slider_grip_right.png
diff --git a/res/drawable-hdpi-finger/fasttrack_slider_presence_active.png b/res/drawable-hdpi-finger/quickcontact_slider_presence_active.png
similarity index 100%
rename from res/drawable-hdpi-finger/fasttrack_slider_presence_active.png
rename to res/drawable-hdpi-finger/quickcontact_slider_presence_active.png
diff --git a/res/drawable-hdpi-finger/fasttrack_slider_presence_away.png b/res/drawable-hdpi-finger/quickcontact_slider_presence_away.png
similarity index 100%
rename from res/drawable-hdpi-finger/fasttrack_slider_presence_away.png
rename to res/drawable-hdpi-finger/quickcontact_slider_presence_away.png
diff --git a/res/drawable-hdpi-finger/fasttrack_slider_presence_busy.png b/res/drawable-hdpi-finger/quickcontact_slider_presence_busy.png
similarity index 100%
rename from res/drawable-hdpi-finger/fasttrack_slider_presence_busy.png
rename to res/drawable-hdpi-finger/quickcontact_slider_presence_busy.png
diff --git a/res/drawable-hdpi-finger/fasttrack_slider_presence_inactive.png b/res/drawable-hdpi-finger/quickcontact_slider_presence_inactive.png
similarity index 100%
rename from res/drawable-hdpi-finger/fasttrack_slider_presence_inactive.png
rename to res/drawable-hdpi-finger/quickcontact_slider_presence_inactive.png
diff --git a/res/drawable-hdpi-finger/fasttrack_top_frame.9.png b/res/drawable-hdpi-finger/quickcontact_top_frame.9.png
similarity index 100%
rename from res/drawable-hdpi-finger/fasttrack_top_frame.9.png
rename to res/drawable-hdpi-finger/quickcontact_top_frame.9.png
diff --git a/res/drawable-mdpi-finger/fasttrack_arrow_down.png b/res/drawable-mdpi-finger/quickcontact_arrow_down.png
similarity index 100%
rename from res/drawable-mdpi-finger/fasttrack_arrow_down.png
rename to res/drawable-mdpi-finger/quickcontact_arrow_down.png
diff --git a/res/drawable-mdpi-finger/fasttrack_arrow_up.png b/res/drawable-mdpi-finger/quickcontact_arrow_up.png
similarity index 100%
rename from res/drawable-mdpi-finger/fasttrack_arrow_up.png
rename to res/drawable-mdpi-finger/quickcontact_arrow_up.png
diff --git a/res/drawable-mdpi-finger/fasttrack_bottom_frame.9.png b/res/drawable-mdpi-finger/quickcontact_bottom_frame.9.png
similarity index 100%
rename from res/drawable-mdpi-finger/fasttrack_bottom_frame.9.png
rename to res/drawable-mdpi-finger/quickcontact_bottom_frame.9.png
diff --git a/res/drawable-mdpi-finger/fasttrack_disambig_bottom_bg.9.png b/res/drawable-mdpi-finger/quickcontact_disambig_bottom_bg.9.png
similarity index 100%
rename from res/drawable-mdpi-finger/fasttrack_disambig_bottom_bg.9.png
rename to res/drawable-mdpi-finger/quickcontact_disambig_bottom_bg.9.png
diff --git a/res/drawable-mdpi-finger/fasttrack_disambig_checkbox_off.png b/res/drawable-mdpi-finger/quickcontact_disambig_checkbox_off.png
similarity index 100%
rename from res/drawable-mdpi-finger/fasttrack_disambig_checkbox_off.png
rename to res/drawable-mdpi-finger/quickcontact_disambig_checkbox_off.png
diff --git a/res/drawable-mdpi-finger/fasttrack_disambig_checkbox_on.png b/res/drawable-mdpi-finger/quickcontact_disambig_checkbox_on.png
similarity index 100%
rename from res/drawable-mdpi-finger/fasttrack_disambig_checkbox_on.png
rename to res/drawable-mdpi-finger/quickcontact_disambig_checkbox_on.png
diff --git a/res/drawable-mdpi-finger/fasttrack_disambig_divider.9.png b/res/drawable-mdpi-finger/quickcontact_disambig_divider.9.png
similarity index 100%
rename from res/drawable-mdpi-finger/fasttrack_disambig_divider.9.png
rename to res/drawable-mdpi-finger/quickcontact_disambig_divider.9.png
diff --git a/res/drawable-mdpi-finger/fasttrack_drop_shadow.9.png b/res/drawable-mdpi-finger/quickcontact_drop_shadow.9.png
similarity index 100%
rename from res/drawable-mdpi-finger/fasttrack_drop_shadow.9.png
rename to res/drawable-mdpi-finger/quickcontact_drop_shadow.9.png
diff --git a/res/drawable-mdpi-finger/fasttrack_frame_divider_med.png b/res/drawable-mdpi-finger/quickcontact_frame_divider_med.png
similarity index 100%
rename from res/drawable-mdpi-finger/fasttrack_frame_divider_med.png
rename to res/drawable-mdpi-finger/quickcontact_frame_divider_med.png
diff --git a/res/drawable-mdpi-finger/fasttrack_slider_background.png b/res/drawable-mdpi-finger/quickcontact_slider_background.png
similarity index 100%
rename from res/drawable-mdpi-finger/fasttrack_slider_background.png
rename to res/drawable-mdpi-finger/quickcontact_slider_background.png
diff --git a/res/drawable-mdpi-finger/fasttrack_slider_btn_normal.9.png b/res/drawable-mdpi-finger/quickcontact_slider_btn_normal.9.png
similarity index 100%
rename from res/drawable-mdpi-finger/fasttrack_slider_btn_normal.9.png
rename to res/drawable-mdpi-finger/quickcontact_slider_btn_normal.9.png
diff --git a/res/drawable-mdpi-finger/fasttrack_slider_btn_on.9.png b/res/drawable-mdpi-finger/quickcontact_slider_btn_on.9.png
similarity index 100%
rename from res/drawable-mdpi-finger/fasttrack_slider_btn_on.9.png
rename to res/drawable-mdpi-finger/quickcontact_slider_btn_on.9.png
diff --git a/res/drawable-mdpi-finger/fasttrack_slider_btn_pressed.9.png b/res/drawable-mdpi-finger/quickcontact_slider_btn_pressed.9.png
similarity index 100%
rename from res/drawable-mdpi-finger/fasttrack_slider_btn_pressed.9.png
rename to res/drawable-mdpi-finger/quickcontact_slider_btn_pressed.9.png
diff --git a/res/drawable-mdpi-finger/fasttrack_slider_btn_selected.9.png b/res/drawable-mdpi-finger/quickcontact_slider_btn_selected.9.png
similarity index 100%
rename from res/drawable-mdpi-finger/fasttrack_slider_btn_selected.9.png
rename to res/drawable-mdpi-finger/quickcontact_slider_btn_selected.9.png
diff --git a/res/drawable-mdpi-finger/fasttrack_slider_grip_left.png b/res/drawable-mdpi-finger/quickcontact_slider_grip_left.png
similarity index 100%
rename from res/drawable-mdpi-finger/fasttrack_slider_grip_left.png
rename to res/drawable-mdpi-finger/quickcontact_slider_grip_left.png
diff --git a/res/drawable-mdpi-finger/fasttrack_slider_grip_right.png b/res/drawable-mdpi-finger/quickcontact_slider_grip_right.png
similarity index 100%
rename from res/drawable-mdpi-finger/fasttrack_slider_grip_right.png
rename to res/drawable-mdpi-finger/quickcontact_slider_grip_right.png
diff --git a/res/drawable-mdpi-finger/fasttrack_slider_presence_active.png b/res/drawable-mdpi-finger/quickcontact_slider_presence_active.png
similarity index 100%
rename from res/drawable-mdpi-finger/fasttrack_slider_presence_active.png
rename to res/drawable-mdpi-finger/quickcontact_slider_presence_active.png
diff --git a/res/drawable-mdpi-finger/fasttrack_slider_presence_away.png b/res/drawable-mdpi-finger/quickcontact_slider_presence_away.png
similarity index 100%
rename from res/drawable-mdpi-finger/fasttrack_slider_presence_away.png
rename to res/drawable-mdpi-finger/quickcontact_slider_presence_away.png
diff --git a/res/drawable-mdpi-finger/fasttrack_slider_presence_busy.png b/res/drawable-mdpi-finger/quickcontact_slider_presence_busy.png
similarity index 100%
rename from res/drawable-mdpi-finger/fasttrack_slider_presence_busy.png
rename to res/drawable-mdpi-finger/quickcontact_slider_presence_busy.png
diff --git a/res/drawable-mdpi-finger/fasttrack_slider_presence_inactive.png b/res/drawable-mdpi-finger/quickcontact_slider_presence_inactive.png
similarity index 100%
rename from res/drawable-mdpi-finger/fasttrack_slider_presence_inactive.png
rename to res/drawable-mdpi-finger/quickcontact_slider_presence_inactive.png
diff --git a/res/drawable-mdpi-finger/fasttrack_top_frame.9.png b/res/drawable-mdpi-finger/quickcontact_top_frame.9.png
similarity index 100%
rename from res/drawable-mdpi-finger/fasttrack_top_frame.9.png
rename to res/drawable-mdpi-finger/quickcontact_top_frame.9.png
diff --git a/res/drawable/fasttrack.9.png b/res/drawable/quickcontact.9.png
similarity index 100%
rename from res/drawable/fasttrack.9.png
rename to res/drawable/quickcontact.9.png
diff --git a/res/layout-finger/fasttrack.xml b/res/layout-finger/quickcontact.xml
similarity index 79%
rename from res/layout-finger/fasttrack.xml
rename to res/layout-finger/quickcontact.xml
index 46e5d63..33007f7 100644
--- a/res/layout-finger/fasttrack.xml
+++ b/res/layout-finger/quickcontact.xml
@@ -18,7 +18,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/fasttrack_drop_shadow">
+    android:background="@drawable/quickcontact_drop_shadow">
 
     <FrameLayout
         android:id="@+id/header"
@@ -31,21 +31,21 @@
             android:inflatedId="@+id/header_small"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:layout="@layout/fasttrack_header_small" />
+            android:layout="@layout/quickcontact_header_small" />
 
         <ViewStub
             android:id="@+id/header_medium"
             android:inflatedId="@+id/header_medium"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:layout="@layout/fasttrack_header_med" />
+            android:layout="@layout/quickcontact_header_med" />
 
         <ViewStub
             android:id="@+id/header_large"
             android:inflatedId="@+id/header_large"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:layout="@layout/fasttrack_header_large" />
+            android:layout="@layout/quickcontact_header_large" />
 
     </FrameLayout>
 
@@ -55,11 +55,11 @@
         android:layout_height="wrap_content"
         android:layout_below="@id/header"
         android:fadingEdgeLength="0dip"
-        android:background="@drawable/fasttrack_slider_background"
+        android:background="@drawable/quickcontact_slider_background"
         android:scrollbars="none">
 
         <LinearLayout
-            android:id="@+id/fasttrack"
+            android:id="@+id/quickcontact"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:paddingTop="4dip"
@@ -69,12 +69,12 @@
             <ImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:src="@drawable/fasttrack_slider_grip_left" />
+                android:src="@drawable/quickcontact_slider_grip_left" />
 
             <ImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:src="@drawable/fasttrack_slider_grip_right" />
+                android:src="@drawable/quickcontact_slider_grip_right" />
 
         </LinearLayout>
 
@@ -85,14 +85,14 @@
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_below="@id/scroll"
-        android:background="@drawable/fasttrack_bottom_frame" />
+        android:background="@drawable/quickcontact_bottom_frame" />
 
     <LinearLayout
         android:id="@+id/footer_disambig"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_below="@id/scroll"
-        android:background="@drawable/fasttrack_disambig_bottom_bg"
+        android:background="@drawable/quickcontact_disambig_bottom_bg"
         android:orientation="vertical"
         android:visibility="gone">
 
@@ -101,8 +101,8 @@
             android:layout_width="fill_parent"
             android:layout_height="0dip"
 	    android:layout_weight="1"
-            android:background="@color/fasttrack_disambig"
-            android:divider="@drawable/fasttrack_disambig_divider"
+            android:background="@color/quickcontact_disambig"
+            android:divider="@drawable/quickcontact_disambig_divider"
             android:cacheColorHint="@null" />
 
         <CheckBox
@@ -114,9 +114,9 @@
             android:minHeight="60dip"
             android:textColor="#f000"
             android:textStyle="bold"
-            android:text="@string/fasttrack_remember_choice"
+            android:text="@string/quickcontact_remember_choice"
             android:textAppearance="?android:attr/textAppearanceSmallInverse"
-            android:button="@drawable/fasttrack_disambig_checkbox" />
+            android:button="@drawable/quickcontact_disambig_checkbox" />
 
     </LinearLayout>
 
@@ -124,7 +124,7 @@
         android:id="@+id/arrow_up"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:src="@drawable/fasttrack_arrow_up" />
+        android:src="@drawable/quickcontact_arrow_up" />
 
     <ImageView
         android:id="@+id/arrow_down"
@@ -132,6 +132,6 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="-1dip"
         android:layout_below="@id/footer"
-        android:src="@drawable/fasttrack_arrow_down" />
+        android:src="@drawable/quickcontact_arrow_down" />
 
 </RelativeLayout>
diff --git a/res/layout-finger/fasttrack_header_large.xml b/res/layout-finger/quickcontact_header_large.xml
similarity index 94%
rename from res/layout-finger/fasttrack_header_large.xml
rename to res/layout-finger/quickcontact_header_large.xml
index f950349..c94f1ad 100644
--- a/res/layout-finger/fasttrack_header_large.xml
+++ b/res/layout-finger/quickcontact_header_large.xml
@@ -20,7 +20,7 @@
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:minHeight="87dip"
-    android:background="@drawable/fasttrack_top_frame"
+    android:background="@drawable/quickcontact_top_frame"
     android:gravity="center_vertical"
     android:orientation="horizontal">
 
@@ -57,7 +57,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginRight="15dip"
-        android:src="@drawable/fasttrack_slider_presence_active"
+        android:src="@drawable/quickcontact_slider_presence_active"
         android:scaleType="centerInside" />
 
 </LinearLayout>
diff --git a/res/layout-finger/fasttrack_header_med.xml b/res/layout-finger/quickcontact_header_med.xml
similarity index 93%
rename from res/layout-finger/fasttrack_header_med.xml
rename to res/layout-finger/quickcontact_header_med.xml
index 98e9233..3533502 100644
--- a/res/layout-finger/fasttrack_header_med.xml
+++ b/res/layout-finger/quickcontact_header_med.xml
@@ -20,7 +20,7 @@
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:minHeight="45dip"
-    android:background="@drawable/fasttrack_top_frame"
+    android:background="@drawable/quickcontact_top_frame"
     android:gravity="center_vertical"
     android:orientation="horizontal">
 
@@ -40,7 +40,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="1dip"
-        android:src="@drawable/fasttrack_frame_divider_med" />
+        android:src="@drawable/quickcontact_frame_divider_med" />
 
     <ImageView
         android:id="@+id/source"
diff --git a/res/layout-finger/fasttrack_header_small.xml b/res/layout-finger/quickcontact_header_small.xml
similarity index 93%
rename from res/layout-finger/fasttrack_header_small.xml
rename to res/layout-finger/quickcontact_header_small.xml
index feb49f2..3711dcc 100644
--- a/res/layout-finger/fasttrack_header_small.xml
+++ b/res/layout-finger/quickcontact_header_small.xml
@@ -19,5 +19,5 @@
     android:id="@+id/header_small"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/fasttrack_top_frame"
+    android:background="@drawable/quickcontact_top_frame"
     android:orientation="horizontal" />
diff --git a/res/layout-finger/fasttrack_item.xml b/res/layout-finger/quickcontact_item.xml
similarity index 94%
rename from res/layout-finger/fasttrack_item.xml
rename to res/layout-finger/quickcontact_item.xml
index 58d85aa..819915d 100644
--- a/res/layout-finger/fasttrack_item.xml
+++ b/res/layout-finger/quickcontact_item.xml
@@ -25,4 +25,4 @@
     android:scaleType="centerInside"
     android:focusable="true"
     android:clickable="true"
-    android:background="@drawable/fasttrack_slider_btn" />
+    android:background="@drawable/quickcontact_slider_btn" />
diff --git a/res/layout-finger/fasttrack_resolve_item.xml b/res/layout-finger/quickcontact_resolve_item.xml
similarity index 100%
rename from res/layout-finger/fasttrack_resolve_item.xml
rename to res/layout-finger/quickcontact_resolve_item.xml
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 12630c0..880c269 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -18,6 +18,6 @@
     <color name="textColorIconOverlay">#fff</color>
     <color name="textColorIconOverlayShadow">#000</color>
     <color name="sect_secondary">#4fff</color>
-    <color name="fasttrack_disambig">#f2f2f2</color>
-    <color name="fasttrack_disambig_divider">#afafaf</color>
+    <color name="quickcontact_disambig">#f2f2f2</color>
+    <color name="quickcontact_disambig_divider">#afafaf</color>
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 4361fd4..845c3dc 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -15,7 +15,7 @@
 -->
 
 <resources>
-    <dimen name="fasttrack_shadow">37dip</dimen>
+    <dimen name="quickcontact_shadow">37dip</dimen>
     <dimen name="edit_photo_size">76dip</dimen>
         
     <!-- The height of the ScrollingTabWidget -->
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 84484c3..60f784d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -918,15 +918,15 @@
 
     <!-- Shown as a toast when the user taps on a Fast-Track icon, and no application
          was found that could perform the selected action -->
-    <string name="fasttrack_missing_app">No application found to handle this action</string>
+    <string name="quickcontact_missing_app">No application found to handle this action</string>
 
     <!-- Shown as the checkbox label that, when checked, will store remember the
          selected choice and shortcut to it in the future.  For example, this would
          make a selected phone number the default. -->
-    <string name="fasttrack_remember_choice">Remember this choice</string>
+    <string name="quickcontact_remember_choice">Remember this choice</string>
 
     <!-- Shown as the header name for a person when the name is missing or unknown. -->
-    <string name="fasttrack_missing_name">Unknown</string>
+    <string name="quickcontact_missing_name">Unknown</string>
 
     <!-- The menu item to open the list of accounts -->
     <string name="menu_accounts">Accounts</string>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 05c0916..8c5ae35 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -52,15 +52,15 @@
         <item name="android:windowContentOverlay">@null</item>
     </style>
 
-    <style name="FullyTranslucent.FastTrack">
+    <style name="FullyTranslucent.QuickContact">
         <!-- This is a hack because we want to be able to animate away the
-             FastTrack window, and we close its containing activity at the
+             QuickContact window, and we close its containing activity at the
              same time.  So put in a dummy animation so this guy sticks around
              while the fast track window is animating. -->
         <item name="android:windowAnimationStyle">@style/DummyAnimation</item>
     </style>
 
-    <style name="FastTrack">
+    <style name="QuickContact">
         <item name="android:windowFrame">@null</item>
         <item name="android:windowBackground">@android:color/transparent</item>
         <item name="android:windowIsFloating">true</item>
@@ -71,14 +71,14 @@
         -->
     </style>
 
-    <style name="FastTrackAboveAnimation">
-        <item name="android:windowEnterAnimation">@anim/fasttrack_above_enter</item>
-        <item name="android:windowExitAnimation">@anim/fasttrack_above_exit</item>
+    <style name="QuickContactAboveAnimation">
+        <item name="android:windowEnterAnimation">@anim/quickcontact_above_enter</item>
+        <item name="android:windowExitAnimation">@anim/quickcontact_above_exit</item>
     </style>
 
-    <style name="FastTrackBelowAnimation">
-        <item name="android:windowEnterAnimation">@anim/fasttrack_below_enter</item>
-        <item name="android:windowExitAnimation">@anim/fasttrack_below_exit</item>
+    <style name="QuickContactBelowAnimation">
+        <item name="android:windowEnterAnimation">@anim/quickcontact_below_enter</item>
+        <item name="android:windowExitAnimation">@anim/quickcontact_below_exit</item>
     </style>
 
     <style name="DummyAnimation">
diff --git a/src/com/android/contacts/ContactsListActivity.java b/src/com/android/contacts/ContactsListActivity.java
index 9fcc8a6..5e1638f 100644
--- a/src/com/android/contacts/ContactsListActivity.java
+++ b/src/com/android/contacts/ContactsListActivity.java
@@ -189,8 +189,8 @@ public class ContactsListActivity extends ListActivity implements
     static final int MODE_MASK_NO_DATA = 0x04000000;
     /** Mask for showing a call button in the list */
     static final int MODE_MASK_SHOW_CALL_BUTTON = 0x02000000;
-    /** Mask to disable fasttrack (images will show as normal images) */
-    static final int MODE_MASK_DISABLE_FASTTRACK = 0x01000000;
+    /** Mask to disable quickcontact (images will show as normal images) */
+    static final int MODE_MASK_DISABLE_QUIKCCONTACT = 0x01000000;
     /** Mask to show the total number of contacts at the top */
     static final int MODE_MASK_SHOW_NUMBER_OF_CONTACTS = 0x00800000;
 
@@ -208,16 +208,16 @@ public class ContactsListActivity extends ListActivity implements
     static final int MODE_STREQUENT = 35 | MODE_MASK_SHOW_PHOTOS | MODE_MASK_SHOW_CALL_BUTTON;
     /** Show all contacts and pick them when clicking */
     static final int MODE_PICK_CONTACT = 40 | MODE_MASK_PICKER | MODE_MASK_SHOW_PHOTOS
-            | MODE_MASK_DISABLE_FASTTRACK;
+            | MODE_MASK_DISABLE_QUIKCCONTACT;
     /** Show all contacts as well as the option to create a new one */
     static final int MODE_PICK_OR_CREATE_CONTACT = 42 | MODE_MASK_PICKER | MODE_MASK_CREATE_NEW
-            | MODE_MASK_SHOW_PHOTOS | MODE_MASK_DISABLE_FASTTRACK;
+            | MODE_MASK_SHOW_PHOTOS | MODE_MASK_DISABLE_QUIKCCONTACT;
     /** Show all people through the legacy provider and pick them when clicking */
     static final int MODE_LEGACY_PICK_PERSON = 43 | MODE_MASK_PICKER | MODE_MASK_SHOW_PHOTOS
-            | MODE_MASK_DISABLE_FASTTRACK;
+            | MODE_MASK_DISABLE_QUIKCCONTACT;
     /** Show all people through the legacy provider as well as the option to create a new one */
-    static final int MODE_LEGACY_PICK_OR_CREATE_PERSON = 44 | MODE_MASK_PICKER | MODE_MASK_CREATE_NEW
-            | MODE_MASK_SHOW_PHOTOS | MODE_MASK_DISABLE_FASTTRACK;
+    static final int MODE_LEGACY_PICK_OR_CREATE_PERSON = 44 | MODE_MASK_PICKER
+            | MODE_MASK_CREATE_NEW | MODE_MASK_SHOW_PHOTOS | MODE_MASK_DISABLE_QUIKCCONTACT;
     /** Show all contacts and pick them when clicking, and allow creating a new contact */
     static final int MODE_INSERT_OR_EDIT_CONTACT = 45 | MODE_MASK_PICKER | MODE_MASK_CREATE_NEW;
     /** Show all phone numbers and pick them when clicking */
@@ -239,7 +239,7 @@ public class ContactsListActivity extends ListActivity implements
 
     /** Show join suggestions followed by an A-Z list */
     static final int MODE_JOIN_CONTACT = 70 | MODE_MASK_PICKER | MODE_MASK_NO_PRESENCE
-            | MODE_MASK_NO_DATA | MODE_MASK_SHOW_PHOTOS | MODE_MASK_DISABLE_FASTTRACK;
+            | MODE_MASK_NO_DATA | MODE_MASK_SHOW_PHOTOS | MODE_MASK_DISABLE_QUIKCCONTACT;
 
     /** Maximum number of suggestions shown for joining aggregates */
     static final int MAX_SUGGESTIONS = 4;
@@ -2000,7 +2000,7 @@ public class ContactsListActivity extends ListActivity implements
         public CharArrayBuffer dataBuffer = new CharArrayBuffer(128);
         public ImageView presenceView;
         public QuickContactBadge photoView;
-        public ImageView nonFastTrackPhotoView;
+        public ImageView nonQuickContactPhotoView;
     }
 
     final static class PhotoInfo {
@@ -2304,7 +2304,7 @@ public class ContactsListActivity extends ListActivity implements
             cache.dataView = (TextView) view.findViewById(R.id.data);
             cache.presenceView = (ImageView) view.findViewById(R.id.presence);
             cache.photoView = (QuickContactBadge) view.findViewById(R.id.photo);
-            cache.nonFastTrackPhotoView = (ImageView) view.findViewById(R.id.noQuickContactPhoto);
+            cache.nonQuickContactPhotoView = (ImageView) view.findViewById(R.id.noQuickContactPhoto);
             view.setTag(cache);
 
             return view;
@@ -2371,7 +2371,7 @@ public class ContactsListActivity extends ListActivity implements
 
             // Set the photo, if requested
             if (mDisplayPhotos) {
-                boolean useFastTrack = (mMode & MODE_MASK_DISABLE_FASTTRACK) == 0;
+                boolean useQuickContact = (mMode & MODE_MASK_DISABLE_QUIKCCONTACT) == 0;
 
                 long photoId = 0;
                 if (!cursor.isNull(SUMMARY_PHOTO_ID_COLUMN_INDEX)) {
@@ -2379,18 +2379,18 @@ public class ContactsListActivity extends ListActivity implements
                 }
 
                 ImageView viewToUse;
-                if (useFastTrack) {
+                if (useQuickContact) {
                     viewToUse = cache.photoView;
                     // Build soft lookup reference
                     final long contactId = cursor.getLong(SUMMARY_ID_COLUMN_INDEX);
                     final String lookupKey = cursor.getString(SUMMARY_LOOKUP_KEY);
                     cache.photoView.assignContactUri(Contacts.getLookupUri(contactId, lookupKey));
                     cache.photoView.setVisibility(View.VISIBLE);
-                    cache.nonFastTrackPhotoView.setVisibility(View.INVISIBLE);
+                    cache.nonQuickContactPhotoView.setVisibility(View.INVISIBLE);
                 } else {
-                    viewToUse = cache.nonFastTrackPhotoView;
+                    viewToUse = cache.nonQuickContactPhotoView;
                     cache.photoView.setVisibility(View.INVISIBLE);
-                    cache.nonFastTrackPhotoView.setVisibility(View.VISIBLE);
+                    cache.nonQuickContactPhotoView.setVisibility(View.VISIBLE);
                 }
 
 
diff --git a/src/com/android/contacts/ui/FastTrackActivity.java b/src/com/android/contacts/ui/QuickContactActivity.java
similarity index 61%
rename from src/com/android/contacts/ui/FastTrackActivity.java
rename to src/com/android/contacts/ui/QuickContactActivity.java
index 6958298..5cd2d18 100644
--- a/src/com/android/contacts/ui/FastTrackActivity.java
+++ b/src/com/android/contacts/ui/QuickContactActivity.java
@@ -21,22 +21,23 @@ import android.content.Intent;
 import android.graphics.Rect;
 import android.net.Uri;
 import android.os.Bundle;
-import android.provider.ContactsContract.FastTrack;
+import android.provider.ContactsContract.QuickContact;
 
 /**
- * Stub translucent activity that just shows {@link FastTrackWindow} floating
+ * Stub translucent activity that just shows {@link QuickContactWindow} floating
  * above the caller. This temporary hack should eventually be replaced with
  * direct framework support.
  */
-public final class FastTrackActivity extends Activity implements FastTrackWindow.OnDismissListener {
-    private FastTrackWindow mFastTrack;
+public final class QuickContactActivity extends Activity implements
+        QuickContactWindow.OnDismissListener {
+    private QuickContactWindow mQuickContact;
 
     @Override
     protected void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
-        if (FastTrackWindow.TRACE_LAUNCH) {
-            android.os.Debug.startMethodTracing(FastTrackWindow.TRACE_TAG);
+        if (QuickContactWindow.TRACE_LAUNCH) {
+            android.os.Debug.startMethodTracing(QuickContactWindow.TRACE_TAG);
         }
 
         // Use our local window token for now
@@ -45,22 +46,22 @@ public final class FastTrackActivity extends Activity implements FastTrackWindow
         final Bundle extras = intent.getExtras();
 
         // Read requested parameters for displaying
-        final Rect target = (Rect)extras.getParcelable(FastTrack.EXTRA_TARGET_RECT);
-        final int mode = extras.getInt(FastTrack.EXTRA_MODE, FastTrack.MODE_MEDIUM);
-        final String[] excludeMimes = extras.getStringArray(FastTrack.EXTRA_EXCLUDE_MIMES);
+        final Rect target = (Rect)extras.getParcelable(QuickContact.EXTRA_TARGET_RECT);
+        final int mode = extras.getInt(QuickContact.EXTRA_MODE, QuickContact.MODE_MEDIUM);
+        final String[] excludeMimes = extras.getStringArray(QuickContact.EXTRA_EXCLUDE_MIMES);
 
-        mFastTrack = new FastTrackWindow(this, this);
-        mFastTrack.show(lookupUri, target, mode, excludeMimes);
+        mQuickContact = new QuickContactWindow(this, this);
+        mQuickContact.show(lookupUri, target, mode, excludeMimes);
     }
 
     @Override
     protected void onStop() {
         super.onStop();
-        mFastTrack.dismiss();
+        mQuickContact.dismiss();
     }
 
     /** {@inheritDoc} */
-    public void onDismiss(FastTrackWindow dialog) {
+    public void onDismiss(QuickContactWindow dialog) {
         // When dismissed, finish this activity
         finish();
     }
diff --git a/src/com/android/contacts/ui/FastTrackWindow.java b/src/com/android/contacts/ui/QuickContactWindow.java
similarity index 95%
rename from src/com/android/contacts/ui/FastTrackWindow.java
rename to src/com/android/contacts/ui/QuickContactWindow.java
index 2f0d212..6059079 100644
--- a/src/com/android/contacts/ui/FastTrackWindow.java
+++ b/src/com/android/contacts/ui/QuickContactWindow.java
@@ -40,7 +40,7 @@ import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.provider.ContactsContract.Contacts;
 import android.provider.ContactsContract.Data;
-import android.provider.ContactsContract.FastTrack;
+import android.provider.ContactsContract.QuickContact;
 import android.provider.ContactsContract.Presence;
 import android.provider.ContactsContract.RawContacts;
 import android.provider.ContactsContract.CommonDataKinds.Email;
@@ -86,17 +86,17 @@ import java.util.Set;
  * Window that shows fast-track contact details for a specific
  * {@link Contacts#_ID}.
  */
-public class FastTrackWindow implements Window.Callback,
+public class QuickContactWindow implements Window.Callback,
         NotifyingAsyncQueryHandler.AsyncQueryListener, View.OnClickListener,
         AbsListView.OnItemClickListener, CompoundButton.OnCheckedChangeListener {
-    private static final String TAG = "FastTrackWindow";
+    private static final String TAG = "QuickContactWindow";
 
     /**
-     * Interface used to allow the person showing a {@link FastTrackWindow} to
+     * Interface used to allow the person showing a {@link QuickContactWindow} to
      * know when the window has been dismissed.
      */
     public interface OnDismissListener {
-        public void onDismiss(FastTrackWindow dialog);
+        public void onDismiss(QuickContactWindow dialog);
     }
 
     private final Context mContext;
@@ -164,13 +164,13 @@ public class FastTrackWindow implements Window.Callback,
     private static final int TOKEN_DATA = 3;
 
     static final boolean TRACE_LAUNCH = false;
-    static final String TRACE_TAG = "fasttrack";
+    static final String TRACE_TAG = "quickcontact";
 
     /**
      * Prepare a fast-track window to show in the given {@link Context}.
      */
-    public FastTrackWindow(Context context) {
-        mContext = new ContextThemeWrapper(context, R.style.FastTrack);
+    public QuickContactWindow(Context context) {
+        mContext = new ContextThemeWrapper(context, R.style.QuickContact);
         mInflater = (LayoutInflater)context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
         mWindowManager = (WindowManager)context.getSystemService(Context.WINDOW_SERVICE);
 
@@ -178,7 +178,7 @@ public class FastTrackWindow implements Window.Callback,
         mWindow.setCallback(this);
         mWindow.setWindowManager(mWindowManager, null, null);
 
-        mWindow.setContentView(R.layout.fasttrack);
+        mWindow.setContentView(R.layout.quickcontact);
 
         mArrowUp = (ImageView)mWindow.findViewById(R.id.arrow_up);
         mArrowDown = (ImageView)mWindow.findViewById(R.id.arrow_down);
@@ -186,9 +186,9 @@ public class FastTrackWindow implements Window.Callback,
         mResolveCache = new ResolveCache(mContext);
 
         final Resources res = mContext.getResources();
-        mShadowHeight = res.getDimensionPixelSize(R.dimen.fasttrack_shadow);
+        mShadowHeight = res.getDimensionPixelSize(R.dimen.quickcontact_shadow);
 
-        mTrack = (ViewGroup)mWindow.findViewById(R.id.fasttrack);
+        mTrack = (ViewGroup)mWindow.findViewById(R.id.quickcontact);
         mTrackScroll = (HorizontalScrollView)mWindow.findViewById(R.id.scroll);
 
         mFooter = mWindow.findViewById(R.id.footer);
@@ -199,7 +199,7 @@ public class FastTrackWindow implements Window.Callback,
         mSetPrimaryCheckBox.setOnCheckedChangeListener(this);
 
         // Prepare track entrance animation
-        mTrackAnim = AnimationUtils.loadAnimation(mContext, R.anim.fasttrack);
+        mTrackAnim = AnimationUtils.loadAnimation(mContext, R.anim.quickcontact);
         mTrackAnim.setInterpolator(new Interpolator() {
             public float getInterpolation(float t) {
                 // Pushes past the target area, then snaps back into place.
@@ -215,7 +215,7 @@ public class FastTrackWindow implements Window.Callback,
      * notify the given {@link OnDismissListener} each time this dialog is
      * dismissed.
      */
-    public FastTrackWindow(Context context, OnDismissListener dismissListener) {
+    public QuickContactWindow(Context context, OnDismissListener dismissListener) {
         this(context);
         mDismissListener = dismissListener;
     }
@@ -223,13 +223,13 @@ public class FastTrackWindow implements Window.Callback,
     private View getHeaderView(int mode) {
         View header = null;
         switch (mode) {
-            case FastTrack.MODE_SMALL:
+            case QuickContact.MODE_SMALL:
                 header = mWindow.findViewById(R.id.header_small);
                 break;
-            case FastTrack.MODE_MEDIUM:
+            case QuickContact.MODE_MEDIUM:
                 header = mWindow.findViewById(R.id.header_medium);
                 break;
-            case FastTrack.MODE_LARGE:
+            case QuickContact.MODE_LARGE:
                 header = mWindow.findViewById(R.id.header_large);
                 break;
         }
@@ -264,7 +264,7 @@ public class FastTrackWindow implements Window.Callback,
         mHeader = getHeaderView(mode);
         mExcludeMimes = excludeMimes;
 
-        setHeaderText(R.id.name, R.string.fasttrack_missing_name);
+        setHeaderText(R.id.name, R.string.quickcontact_missing_name);
         setHeaderText(R.id.status, null);
         setHeaderImage(R.id.presence, null);
 
@@ -325,14 +325,14 @@ public class FastTrackWindow implements Window.Callback,
             // edge with top of anchor area, and adjusting to inset arrow.
             showArrow(R.id.arrow_down, mAnchor.centerX());
             l.y = mAnchor.top - blockHeight + mShadowHeight;
-            l.windowAnimations = R.style.FastTrackAboveAnimation;
+            l.windowAnimations = R.style.QuickContactAboveAnimation;
 
         } else {
             // Otherwise show upwards callout, aligning block top with bottom of
             // anchor area, and adjusting to inset arrow.
             showArrow(R.id.arrow_up, mAnchor.centerX());
             l.y = mAnchor.bottom - mShadowHeight;
-            l.windowAnimations = R.style.FastTrackBelowAnimation;
+            l.windowAnimations = R.style.QuickContactBelowAnimation;
 
         }
 
@@ -418,10 +418,10 @@ public class FastTrackWindow implements Window.Callback,
      */
     private synchronized void considerShowing() {
         if (mHasSummary && mHasSocial && mHasActions && !mShowing) {
-            if (mMode == FastTrack.MODE_MEDIUM && !mHasValidSocial) {
+            if (mMode == QuickContact.MODE_MEDIUM && !mHasValidSocial) {
                 // Missing valid social, swap medium for small header
                 mHeader.setVisibility(View.GONE);
-                mHeader = getHeaderView(FastTrack.MODE_SMALL);
+                mHeader = getHeaderView(QuickContact.MODE_SMALL);
             }
 
             // All queries have returned, pull curtain
@@ -546,21 +546,21 @@ public class FastTrackWindow implements Window.Callback,
         int resId = -1;
         switch (status) {
             case Presence.AVAILABLE:
-                resId = R.drawable.fasttrack_slider_presence_active;
+                resId = R.drawable.quickcontact_slider_presence_active;
                 break;
             case Presence.IDLE:
             case Presence.AWAY:
-                resId = R.drawable.fasttrack_slider_presence_away;
+                resId = R.drawable.quickcontact_slider_presence_away;
                 break;
             case Presence.DO_NOT_DISTURB:
-                resId = R.drawable.fasttrack_slider_presence_busy;
+                resId = R.drawable.quickcontact_slider_presence_busy;
                 break;
             case Presence.INVISIBLE:
-                resId = R.drawable.fasttrack_slider_presence_inactive;
+                resId = R.drawable.quickcontact_slider_presence_inactive;
                 break;
             case Presence.OFFLINE:
             default:
-                resId = R.drawable.fasttrack_slider_presence_inactive;
+                resId = R.drawable.quickcontact_slider_presence_inactive;
         }
         return mContext.getResources().getDrawable(resId);
     }
@@ -999,7 +999,8 @@ public class FastTrackWindow implements Window.Callback,
      * the icon provided by the {@link DataKind}.
      */
     private View inflateAction(String mimeType) {
-        CheckableImageView view = (CheckableImageView)mInflater.inflate(R.layout.fasttrack_item, mTrack, false);
+        CheckableImageView view = (CheckableImageView)mInflater.inflate(
+                R.layout.quickcontact_item, mTrack, false);
         boolean isActionSet = false;
 
         // Add direct intent if single child, otherwise flag for multiple
@@ -1095,7 +1096,8 @@ public class FastTrackWindow implements Window.Callback,
                 }
 
             } catch (ActivityNotFoundException e) {
-                Toast.makeText(mContext, R.string.fasttrack_missing_app, Toast.LENGTH_SHORT).show();
+                Toast.makeText(mContext, R.string.quickcontact_missing_app, Toast.LENGTH_SHORT)
+                        .show();
             }
         } else if (tag instanceof ActionList) {
             // Incoming tag is a MIME-type, so show resolution list
@@ -1120,7 +1122,8 @@ public class FastTrackWindow implements Window.Callback,
 
                 public View getView(int position, View convertView, ViewGroup parent) {
                     if (convertView == null) {
-                        convertView = mInflater.inflate(R.layout.fasttrack_resolve_item, parent, false);
+                        convertView = mInflater.inflate(
+                                R.layout.quickcontact_resolve_item, parent, false);
                     }
 
                     // Set action title based on summary value
diff --git a/src/com/android/contacts/ui/widget/CheckableImageView.java b/src/com/android/contacts/ui/widget/CheckableImageView.java
index ceddf57..ff5abc0 100644
--- a/src/com/android/contacts/ui/widget/CheckableImageView.java
+++ b/src/com/android/contacts/ui/widget/CheckableImageView.java
@@ -23,7 +23,7 @@ import android.widget.ImageView;
 
 /**
  * A special variation of ImageView that can be used as a checkable object.
- * This is used as the background view of fasttrack chiclet, which is in checked state
+ * This is used as the background view of quickcontact chiclet, which is in checked state
  * when disambig list is shown. Otherwise, it works identically to a ImageView.
  */
 public class CheckableImageView extends ImageView implements Checkable {
-- 
2.11.0