From: Evan Millar <emillar@google.com>
Date: Thu, 1 Oct 2009 20:49:39 +0000 (-0700)
Subject: am e9163527: am ad76e2f1: Merge change I8490c0ec into eclair
X-Git-Tag: android-x86-2.2~328
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e870a85d8c5b8b855921559179abb3bcfcfcd03d;p=android-x86%2Fpackages-apps-Contacts.git

am e9163527: am ad76e2f1: Merge change I8490c0ec into eclair

Merge commit 'e9163527b4e053026261c83a92f1193bb4bb31fa'

* commit 'e9163527b4e053026261c83a92f1193bb4bb31fa':
  com.android.contacts.action.FAST_TRACK->com.android.contacts.action.QUICK_CONTACT
---

e870a85d8c5b8b855921559179abb3bcfcfcd03d
diff --cc AndroidManifest.xml
index 67a55c0,0950ff0..d3a474b
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@@ -261,14 -261,14 +261,14 @@@
              </intent-filter>
          </activity>
  
 -        <!-- Used to show QuickContact window over a translucent activity, which is a
 +        <!-- Used to show FastTrack window over a translucent activity, which is a
               temporary hack until we add better framework support. -->
          <activity
 -            android:name=".ui.QuickContactActivity"
 -            android:theme="@style/FullyTranslucent.QuickContact">
 +            android:name=".ui.FastTrackActivity"
 +            android:theme="@style/FullyTranslucent.FastTrack">
  
              <intent-filter>
-                 <action android:name="com.android.contacts.action.FAST_TRACK" />
+                 <action android:name="com.android.contacts.action.QUICK_CONTACT" />
                  <category android:name="android.intent.category.DEFAULT" />
                  <data android:mimeType="vnd.android.cursor.item/contact" android:host="com.android.contacts" />
              </intent-filter>