am 5042f7ea: Unhide ContactsContract#QuickContact and fix sdk build

Merge commit '5042f7eae6baa6fa4f93248361e94eeb6894f90f' into eclair-plus-aosp

* commit '5042f7eae6baa6fa4f93248361e94eeb6894f90f':
  Unhide ContactsContract#QuickContact and fix sdk build
This commit is contained in:
Evan Millar
2009-09-30 22:13:29 -07:00
committed by Android Git Automerger
2 changed files with 95 additions and 5 deletions

View File

@@ -115752,6 +115752,98 @@
>
</constructor>
</class>
<class name="ContactsContract.QuickContact"
extends="java.lang.Object"
abstract="false"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
<constructor name="ContactsContract.QuickContact"
type="android.provider.ContactsContract.QuickContact"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
</constructor>
<method name="showQuickContact"
return="void"
abstract="false"
native="false"
synchronized="false"
static="true"
final="false"
deprecated="not deprecated"
visibility="public"
>
<parameter name="context" type="android.content.Context">
</parameter>
<parameter name="target" type="android.view.View">
</parameter>
<parameter name="lookupUri" type="android.net.Uri">
</parameter>
<parameter name="mode" type="int">
</parameter>
<parameter name="excludeMimes" type="java.lang.String[]">
</parameter>
</method>
<method name="showQuickContact"
return="void"
abstract="false"
native="false"
synchronized="false"
static="true"
final="false"
deprecated="not deprecated"
visibility="public"
>
<parameter name="context" type="android.content.Context">
</parameter>
<parameter name="target" type="android.graphics.Rect">
</parameter>
<parameter name="lookupUri" type="android.net.Uri">
</parameter>
<parameter name="mode" type="int">
</parameter>
<parameter name="excludeMimes" type="java.lang.String[]">
</parameter>
</method>
<field name="MODE_LARGE"
type="int"
transient="false"
volatile="false"
value="3"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="MODE_MEDIUM"
type="int"
transient="false"
volatile="false"
value="2"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="MODE_SMALL"
type="int"
transient="false"
volatile="false"
value="1"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
</class>
<class name="ContactsContract.RawContacts"
extends="java.lang.Object"
abstract="false"

View File

@@ -2133,16 +2133,14 @@ public final class ContactsContract {
/**
* Helper methods to display QuickContact dialogs that allow users to pivot on
* a specific {@link Contacts} entry.
*
* @hide
*/
public static final class QuickContact {
/**
* Action used to trigger person pivot dialog.
* @hide
*/
public static final String ACTION_FAST_TRACK =
"com.android.contacts.action.FAST_TRACK";
public static final String ACTION_QUICK_CONTACT =
"com.android.contacts.action.QUICK_CONTACT";
/**
* Extra used to specify pivot dialog location in screen coordinates.
@@ -2247,7 +2245,7 @@ public final class ContactsContract {
public static void showQuickContact(Context context, Rect target, Uri lookupUri, int mode,
String[] excludeMimes) {
// Launch pivot dialog through intent for now
final Intent intent = new Intent(ACTION_FAST_TRACK);
final Intent intent = new Intent(ACTION_QUICK_CONTACT);
intent.setData(lookupUri);
intent.putExtra(EXTRA_TARGET_RECT, target);
intent.putExtra(EXTRA_MODE, mode);