Merge "Revert "Push chooser targets to the shortcut manager."" into oc-dev (be3ee7ee) · Commits · e / os / android_frameworks_base

api/current.txt

+8 −8

Original line number	Diff line number	Diff line
		@@ -10333,12 +10333,12 @@ package android.content.pm {
		ctor public LauncherApps.ShortcutQuery();
		method public android.content.pm.LauncherApps.ShortcutQuery setActivity(android.content.ComponentName);
		method public android.content.pm.LauncherApps.ShortcutQuery setChangedSince(long);
		method public android.content.pm.LauncherApps.ShortcutQuery setIntent(android.content.Intent);
		method public deprecated android.content.pm.LauncherApps.ShortcutQuery setIntent(android.content.Intent);
		method public android.content.pm.LauncherApps.ShortcutQuery setPackage(java.lang.String);
		method public android.content.pm.LauncherApps.ShortcutQuery setQueryFlags(int);
		method public android.content.pm.LauncherApps.ShortcutQuery setShortcutIds(java.util.List<java.lang.String>);
		field public static final int FLAG_GET_KEY_FIELDS_ONLY = 4; // 0x4
		field public static final int FLAG_MATCH_CHOOSER = 16; // 0x10
		field public static final deprecated int FLAG_MATCH_CHOOSER = 16; // 0x10
		field public static final int FLAG_MATCH_DYNAMIC = 1; // 0x1
		field public static final int FLAG_MATCH_MANIFEST = 8; // 0x8
		field public static final int FLAG_MATCH_PINNED = 2; // 0x2
		@@ -10888,9 +10888,9 @@ package android.content.pm {
		method public int describeContents();
		method public android.content.ComponentName getActivity();
		method public java.util.Set<java.lang.String> getCategories();
		method public android.content.ComponentName[] getChooserComponentNames();
		method public android.os.PersistableBundle getChooserExtras();
		method public android.content.IntentFilter[] getChooserIntentFilters();
		method public deprecated android.content.ComponentName[] getChooserComponentNames();
		method public deprecated android.os.PersistableBundle getChooserExtras();
		method public deprecated android.content.IntentFilter[] getChooserIntentFilters();
		method public java.lang.CharSequence getDisabledMessage();
		method public android.os.PersistableBundle getExtras();
		method public java.lang.String getId();
		@@ -10903,7 +10903,7 @@ package android.content.pm {
		method public java.lang.CharSequence getShortLabel();
		method public android.os.UserHandle getUserHandle();
		method public boolean hasKeyFieldsOnly();
		method public boolean isChooser();
		method public deprecated boolean isChooser();
		method public boolean isDeclaredInManifest();
		method public boolean isDynamic();
		method public boolean isEnabled();
		@@ -10916,11 +10916,11 @@ package android.content.pm {

		public static class ShortcutInfo.Builder {
		ctor public ShortcutInfo.Builder(android.content.Context, java.lang.String);
		method public android.content.pm.ShortcutInfo.Builder addChooserIntentFilter(android.content.IntentFilter, android.content.ComponentName);
		method public deprecated android.content.pm.ShortcutInfo.Builder addChooserIntentFilter(android.content.IntentFilter, android.content.ComponentName);
		method public android.content.pm.ShortcutInfo build();
		method public android.content.pm.ShortcutInfo.Builder setActivity(android.content.ComponentName);
		method public android.content.pm.ShortcutInfo.Builder setCategories(java.util.Set<java.lang.String>);
		method public android.content.pm.ShortcutInfo.Builder setChooserExtras(android.os.PersistableBundle);
		method public deprecated android.content.pm.ShortcutInfo.Builder setChooserExtras(android.os.PersistableBundle);
		method public android.content.pm.ShortcutInfo.Builder setDisabledMessage(java.lang.CharSequence);
		method public android.content.pm.ShortcutInfo.Builder setExtras(android.os.PersistableBundle);
		method public android.content.pm.ShortcutInfo.Builder setIcon(android.graphics.drawable.Icon);

api/system-current.txt

+8 −8

Original line number	Diff line number	Diff line
		@@ -10957,12 +10957,12 @@ package android.content.pm {
		ctor public LauncherApps.ShortcutQuery();
		method public android.content.pm.LauncherApps.ShortcutQuery setActivity(android.content.ComponentName);
		method public android.content.pm.LauncherApps.ShortcutQuery setChangedSince(long);
		method public android.content.pm.LauncherApps.ShortcutQuery setIntent(android.content.Intent);
		method public deprecated android.content.pm.LauncherApps.ShortcutQuery setIntent(android.content.Intent);
		method public android.content.pm.LauncherApps.ShortcutQuery setPackage(java.lang.String);
		method public android.content.pm.LauncherApps.ShortcutQuery setQueryFlags(int);
		method public android.content.pm.LauncherApps.ShortcutQuery setShortcutIds(java.util.List<java.lang.String>);
		field public static final int FLAG_GET_KEY_FIELDS_ONLY = 4; // 0x4
		field public static final int FLAG_MATCH_CHOOSER = 16; // 0x10
		field public static final deprecated int FLAG_MATCH_CHOOSER = 16; // 0x10
		field public static final int FLAG_MATCH_DYNAMIC = 1; // 0x1
		field public static final int FLAG_MATCH_MANIFEST = 8; // 0x8
		field public static final int FLAG_MATCH_PINNED = 2; // 0x2
		@@ -11606,9 +11606,9 @@ package android.content.pm {
		method public int describeContents();
		method public android.content.ComponentName getActivity();
		method public java.util.Set<java.lang.String> getCategories();
		method public android.content.ComponentName[] getChooserComponentNames();
		method public android.os.PersistableBundle getChooserExtras();
		method public android.content.IntentFilter[] getChooserIntentFilters();
		method public deprecated android.content.ComponentName[] getChooserComponentNames();
		method public deprecated android.os.PersistableBundle getChooserExtras();
		method public deprecated android.content.IntentFilter[] getChooserIntentFilters();
		method public java.lang.CharSequence getDisabledMessage();
		method public android.os.PersistableBundle getExtras();
		method public java.lang.String getId();
		@@ -11621,7 +11621,7 @@ package android.content.pm {
		method public java.lang.CharSequence getShortLabel();
		method public android.os.UserHandle getUserHandle();
		method public boolean hasKeyFieldsOnly();
		method public boolean isChooser();
		method public deprecated boolean isChooser();
		method public boolean isDeclaredInManifest();
		method public boolean isDynamic();
		method public boolean isEnabled();
		@@ -11634,11 +11634,11 @@ package android.content.pm {

		public static class ShortcutInfo.Builder {
		ctor public ShortcutInfo.Builder(android.content.Context, java.lang.String);
		method public android.content.pm.ShortcutInfo.Builder addChooserIntentFilter(android.content.IntentFilter, android.content.ComponentName);
		method public deprecated android.content.pm.ShortcutInfo.Builder addChooserIntentFilter(android.content.IntentFilter, android.content.ComponentName);
		method public android.content.pm.ShortcutInfo build();
		method public android.content.pm.ShortcutInfo.Builder setActivity(android.content.ComponentName);
		method public android.content.pm.ShortcutInfo.Builder setCategories(java.util.Set<java.lang.String>);
		method public android.content.pm.ShortcutInfo.Builder setChooserExtras(android.os.PersistableBundle);
		method public deprecated android.content.pm.ShortcutInfo.Builder setChooserExtras(android.os.PersistableBundle);
		method public android.content.pm.ShortcutInfo.Builder setDisabledMessage(java.lang.CharSequence);
		method public android.content.pm.ShortcutInfo.Builder setExtras(android.os.PersistableBundle);
		method public android.content.pm.ShortcutInfo.Builder setIcon(android.graphics.drawable.Icon);

api/test-current.txt

+8 −8

Original line number	Diff line number	Diff line
		@@ -10369,12 +10369,12 @@ package android.content.pm {
		ctor public LauncherApps.ShortcutQuery();
		method public android.content.pm.LauncherApps.ShortcutQuery setActivity(android.content.ComponentName);
		method public android.content.pm.LauncherApps.ShortcutQuery setChangedSince(long);
		method public android.content.pm.LauncherApps.ShortcutQuery setIntent(android.content.Intent);
		method public deprecated android.content.pm.LauncherApps.ShortcutQuery setIntent(android.content.Intent);
		method public android.content.pm.LauncherApps.ShortcutQuery setPackage(java.lang.String);
		method public android.content.pm.LauncherApps.ShortcutQuery setQueryFlags(int);
		method public android.content.pm.LauncherApps.ShortcutQuery setShortcutIds(java.util.List<java.lang.String>);
		field public static final int FLAG_GET_KEY_FIELDS_ONLY = 4; // 0x4
		field public static final int FLAG_MATCH_CHOOSER = 16; // 0x10
		field public static final deprecated int FLAG_MATCH_CHOOSER = 16; // 0x10
		field public static final int FLAG_MATCH_DYNAMIC = 1; // 0x1
		field public static final int FLAG_MATCH_MANIFEST = 8; // 0x8
		field public static final int FLAG_MATCH_PINNED = 2; // 0x2
		@@ -10928,9 +10928,9 @@ package android.content.pm {
		method public int describeContents();
		method public android.content.ComponentName getActivity();
		method public java.util.Set<java.lang.String> getCategories();
		method public android.content.ComponentName[] getChooserComponentNames();
		method public android.os.PersistableBundle getChooserExtras();
		method public android.content.IntentFilter[] getChooserIntentFilters();
		method public deprecated android.content.ComponentName[] getChooserComponentNames();
		method public deprecated android.os.PersistableBundle getChooserExtras();
		method public deprecated android.content.IntentFilter[] getChooserIntentFilters();
		method public java.lang.CharSequence getDisabledMessage();
		method public android.os.PersistableBundle getExtras();
		method public java.lang.String getId();
		@@ -10943,7 +10943,7 @@ package android.content.pm {
		method public java.lang.CharSequence getShortLabel();
		method public android.os.UserHandle getUserHandle();
		method public boolean hasKeyFieldsOnly();
		method public boolean isChooser();
		method public deprecated boolean isChooser();
		method public boolean isDeclaredInManifest();
		method public boolean isDynamic();
		method public boolean isEnabled();
		@@ -10956,11 +10956,11 @@ package android.content.pm {

		public static class ShortcutInfo.Builder {
		ctor public ShortcutInfo.Builder(android.content.Context, java.lang.String);
		method public android.content.pm.ShortcutInfo.Builder addChooserIntentFilter(android.content.IntentFilter, android.content.ComponentName);
		method public deprecated android.content.pm.ShortcutInfo.Builder addChooserIntentFilter(android.content.IntentFilter, android.content.ComponentName);
		method public android.content.pm.ShortcutInfo build();
		method public android.content.pm.ShortcutInfo.Builder setActivity(android.content.ComponentName);
		method public android.content.pm.ShortcutInfo.Builder setCategories(java.util.Set<java.lang.String>);
		method public android.content.pm.ShortcutInfo.Builder setChooserExtras(android.os.PersistableBundle);
		method public deprecated android.content.pm.ShortcutInfo.Builder setChooserExtras(android.os.PersistableBundle);
		method public android.content.pm.ShortcutInfo.Builder setDisabledMessage(java.lang.CharSequence);
		method public android.content.pm.ShortcutInfo.Builder setExtras(android.os.PersistableBundle);
		method public android.content.pm.ShortcutInfo.Builder setIcon(android.graphics.drawable.Icon);

core/java/android/content/pm/ILauncherApps.aidl

+1 −2

Original line number	Diff line number	Diff line
		@@ -55,8 +55,7 @@ interface ILauncherApps {
		String callingPackage, String packageName, int flags, in UserHandle user);

		ParceledListSlice getShortcuts(String callingPackage, long changedSince, String packageName,
		in List shortcutIds, in ComponentName componentName, in Intent intent, int flags,
		in UserHandle user);
		in List shortcutIds, in ComponentName componentName, int flags, in UserHandle user);
		void pinShortcuts(String callingPackage, String packageName, in List<String> shortcutIds,
		in UserHandle user);
		boolean startShortcut(String callingPackage, String packageName, String id,

core/java/android/content/pm/LauncherApps.java

+5 −14

Original line number	Diff line number	Diff line
		@@ -275,11 +275,8 @@ public class LauncherApps {
		@Deprecated
		public static final int FLAG_GET_MANIFEST = FLAG_MATCH_MANIFEST;

		/**
		* Include chooser shortcuts in the result.
		* STOPSHIP TODO: Unless explicitly requesting chooser fields, we should strip out chooser
		* relevant fields from the Shortcut. This should also be adequately documented.
		*/
		/** @deprecated punted, don't use. */
		@Deprecated
		public static final int FLAG_MATCH_CHOOSER = 1 << 4;

		/**
		@@ -319,7 +316,6 @@ public class LauncherApps {
		FLAG_MATCH_DYNAMIC,
		FLAG_MATCH_PINNED,
		FLAG_MATCH_MANIFEST,
		FLAG_MATCH_CHOOSER,
		FLAG_GET_KEY_FIELDS_ONLY,
		})
		@Retention(RetentionPolicy.SOURCE)
		@@ -336,9 +332,6 @@ public class LauncherApps {
		@Nullable
		ComponentName mActivity;

		@Nullable
		Intent mIntent;

		@QueryFlags
		int mQueryFlags;

		@@ -382,11 +375,9 @@ public class LauncherApps {
		return this;
		}

		/**
		* If non-null, returns only shortcuts with intent filters that match this intent.
		*/
		/** @deprecated punted, don't use. */
		@Deprecated
		public ShortcutQuery setIntent(@Nullable Intent intent) {
		mIntent = intent;
		return this;
		}

		@@ -704,7 +695,7 @@ public class LauncherApps {
		try {
		return mService.getShortcuts(mContext.getPackageName(),
		query.mChangedSince, query.mPackage, query.mShortcutIds, query.mActivity,
		query.mIntent, query.mQueryFlags, user)
		query.mQueryFlags, user)
		.getList();
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();