diff options
| author | Adam Powell <adamp@google.com> | 2015-03-05 00:07:52 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-03-05 00:07:53 +0000 |
| commit | 27b7c1f526b7b0e9dd97566ccf6cbd28bfeab285 (patch) | |
| tree | 45c03090968e027353e60cd583d8fd9ce1225d49 /api | |
| parent | c623ec973b5e8d1fd2ff4162d5de8701a6490121 (diff) | |
| parent | e30c9af3566cfa14796144b352230709c7b5647d (diff) | |
| download | frameworks_base-27b7c1f526b7b0e9dd97566ccf6cbd28bfeab285.zip frameworks_base-27b7c1f526b7b0e9dd97566ccf6cbd28bfeab285.tar.gz frameworks_base-27b7c1f526b7b0e9dd97566ccf6cbd28bfeab285.tar.bz2 | |
Merge "Add ChooserTargetService API"
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 25 | ||||
| -rw-r--r-- | api/system-current.txt | 25 |
2 files changed, 50 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index ef400ea..d688820 100644 --- a/api/current.txt +++ b/api/current.txt @@ -21,6 +21,7 @@ package android { field public static final java.lang.String BIND_ACCESSIBILITY_SERVICE = "android.permission.BIND_ACCESSIBILITY_SERVICE"; field public static final java.lang.String BIND_APPWIDGET = "android.permission.BIND_APPWIDGET"; field public static final java.lang.String BIND_CARRIER_MESSAGING_SERVICE = "android.permission.BIND_CARRIER_MESSAGING_SERVICE"; + field public static final java.lang.String BIND_CHOOSER_TARGET_SERVICE = "android.permission.BIND_CHOOSER_TARGET_SERVICE"; field public static final java.lang.String BIND_DEVICE_ADMIN = "android.permission.BIND_DEVICE_ADMIN"; field public static final java.lang.String BIND_DREAM_SERVICE = "android.permission.BIND_DREAM_SERVICE"; field public static final java.lang.String BIND_INPUT_METHOD = "android.permission.BIND_INPUT_METHOD"; @@ -27459,6 +27460,30 @@ package android.service.carrier { } +package android.service.chooser { + + public final class ChooserTarget implements android.os.Parcelable { + ctor public ChooserTarget(java.lang.CharSequence, android.graphics.Bitmap, float, android.app.PendingIntent); + ctor public ChooserTarget(java.lang.CharSequence, android.graphics.Bitmap, float, android.content.IntentSender); + method public int describeContents(); + method public android.graphics.Bitmap getIcon(); + method public android.content.IntentSender getIntentSender(); + method public float getScore(); + method public java.lang.CharSequence getTitle(); + method public boolean sendIntent(android.content.Context, android.content.Intent); + method public void writeToParcel(android.os.Parcel, int); + field public static final android.os.Parcelable.Creator<android.service.chooser.ChooserTarget> CREATOR; + } + + public abstract class ChooserTargetService extends android.app.Service { + ctor public ChooserTargetService(); + method public android.os.IBinder onBind(android.content.Intent); + method public abstract java.util.List<android.service.chooser.ChooserTarget> onGetChooserTargets(android.content.ComponentName, android.content.IntentFilter); + field public static final java.lang.String SERVICE_INTERFACE = "android.service.chooser.ChooserTargetService"; + } + +} + package android.service.dreams { public class DreamService extends android.app.Service implements android.view.Window.Callback { diff --git a/api/system-current.txt b/api/system-current.txt index 8d76673..f06ff1f 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -29,6 +29,7 @@ package android { field public static final java.lang.String BIND_ACCESSIBILITY_SERVICE = "android.permission.BIND_ACCESSIBILITY_SERVICE"; field public static final java.lang.String BIND_APPWIDGET = "android.permission.BIND_APPWIDGET"; field public static final java.lang.String BIND_CARRIER_MESSAGING_SERVICE = "android.permission.BIND_CARRIER_MESSAGING_SERVICE"; + field public static final java.lang.String BIND_CHOOSER_TARGET_SERVICE = "android.permission.BIND_CHOOSER_TARGET_SERVICE"; field public static final java.lang.String BIND_CONDITION_PROVIDER_SERVICE = "android.permission.BIND_CONDITION_PROVIDER_SERVICE"; field public static final java.lang.String BIND_CONNECTION_SERVICE = "android.permission.BIND_CONNECTION_SERVICE"; field public static final java.lang.String BIND_DEVICE_ADMIN = "android.permission.BIND_DEVICE_ADMIN"; @@ -29060,6 +29061,30 @@ package android.service.carrier { } +package android.service.chooser { + + public final class ChooserTarget implements android.os.Parcelable { + ctor public ChooserTarget(java.lang.CharSequence, android.graphics.Bitmap, float, android.app.PendingIntent); + ctor public ChooserTarget(java.lang.CharSequence, android.graphics.Bitmap, float, android.content.IntentSender); + method public int describeContents(); + method public android.graphics.Bitmap getIcon(); + method public android.content.IntentSender getIntentSender(); + method public float getScore(); + method public java.lang.CharSequence getTitle(); + method public boolean sendIntent(android.content.Context, android.content.Intent); + method public void writeToParcel(android.os.Parcel, int); + field public static final android.os.Parcelable.Creator<android.service.chooser.ChooserTarget> CREATOR; + } + + public abstract class ChooserTargetService extends android.app.Service { + ctor public ChooserTargetService(); + method public android.os.IBinder onBind(android.content.Intent); + method public abstract java.util.List<android.service.chooser.ChooserTarget> onGetChooserTargets(android.content.ComponentName, android.content.IntentFilter); + field public static final java.lang.String SERVICE_INTERFACE = "android.service.chooser.ChooserTargetService"; + } + +} + package android.service.dreams { public class DreamService extends android.app.Service implements android.view.Window.Callback { |