Merge "Actually remove the chooser APIs" into oc-dev am: fbadd6dac9 (c40f2ab7) · Commits · e / os / android_frameworks_base

api/current.txt

+0 −8

Original line number	Diff line number	Diff line
		@@ -10360,12 +10360,10 @@ 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 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 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
		@@ -10919,9 +10917,6 @@ 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 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();
		@@ -10934,7 +10929,6 @@ package android.content.pm {
		method public java.lang.CharSequence getShortLabel();
		method public android.os.UserHandle getUserHandle();
		method public boolean hasKeyFieldsOnly();
		method public deprecated boolean isChooser();
		method public boolean isDeclaredInManifest();
		method public boolean isDynamic();
		method public boolean isEnabled();
		@@ -10947,11 +10941,9 @@ package android.content.pm {

		public static class ShortcutInfo.Builder {
		ctor public ShortcutInfo.Builder(android.content.Context, java.lang.String);
		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 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

+0 −8

Original line number	Diff line number	Diff line
		@@ -11021,12 +11021,10 @@ 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 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 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
		@@ -11674,9 +11672,6 @@ 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 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();
		@@ -11689,7 +11684,6 @@ package android.content.pm {
		method public java.lang.CharSequence getShortLabel();
		method public android.os.UserHandle getUserHandle();
		method public boolean hasKeyFieldsOnly();
		method public deprecated boolean isChooser();
		method public boolean isDeclaredInManifest();
		method public boolean isDynamic();
		method public boolean isEnabled();
		@@ -11702,11 +11696,9 @@ package android.content.pm {

		public static class ShortcutInfo.Builder {
		ctor public ShortcutInfo.Builder(android.content.Context, java.lang.String);
		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 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

+0 −8

Original line number	Diff line number	Diff line
		@@ -10397,12 +10397,10 @@ 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 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 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
		@@ -10960,9 +10958,6 @@ 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 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();
		@@ -10975,7 +10970,6 @@ package android.content.pm {
		method public java.lang.CharSequence getShortLabel();
		method public android.os.UserHandle getUserHandle();
		method public boolean hasKeyFieldsOnly();
		method public deprecated boolean isChooser();
		method public boolean isDeclaredInManifest();
		method public boolean isDynamic();
		method public boolean isEnabled();
		@@ -10988,11 +10982,9 @@ package android.content.pm {

		public static class ShortcutInfo.Builder {
		ctor public ShortcutInfo.Builder(android.content.Context, java.lang.String);
		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 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/LauncherApps.java

+0 −10

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

		/** @deprecated punted, don't use. */
		@Deprecated
		public static final int FLAG_MATCH_CHOOSER = 1 << 4;

		/**
		* Does not retrieve CHOOSER only shortcuts.
		* TODO: Add another flag for MATCH_ALL_PINNED
		@@ -375,12 +371,6 @@ public class LauncherApps {
		return this;
		}

		/** @deprecated punted, don't use. */
		@Deprecated
		public ShortcutQuery setIntent(@Nullable Intent intent) {
		return this;
		}

		/**
		* Set query options. At least one of the {@code MATCH} flags should be set. Otherwise,
		* no shortcuts will be returned.

core/java/android/content/pm/ShortcutInfo.java

+0 −41

Original line number	Diff line number	Diff line
		@@ -1032,20 +1032,6 @@ public final class ShortcutInfo implements Parcelable {
		return this;
		}

		/** @deprecated punted, don't use. */
		@Deprecated
		@NonNull
		public Builder setChooserExtras(@NonNull PersistableBundle extras) {
		return this;
		}

		/** @deprecated punted, don't use. */
		@Deprecated
		public Builder addChooserIntentFilter(@NonNull IntentFilter filter,
		@NonNull ComponentName name) {
		return this;
		}

		/**
		* Creates a {@link ShortcutInfo} instance.
		*/
		@@ -1246,27 +1232,6 @@ public final class ShortcutInfo implements Parcelable {
		return mIntentPersistableExtrases;
		}

		/** @deprecated punted, don't use. */
		@Deprecated
		@NonNull
		public PersistableBundle getChooserExtras() {
		return new PersistableBundle();
		}

		/** @deprecated punted, don't use. */
		@Deprecated
		@NonNull
		public IntentFilter[] getChooserIntentFilters() {
		return new IntentFilter[0];
		}

		/** @deprecated punted, don't use. */
		@Deprecated
		@NonNull
		public ComponentName[] getChooserComponentNames() {
		return new ComponentName[0];
		}

		/**
		* "Rank" of a shortcut, which is a non-negative, sequential value that's unique for each
		* {@link #getActivity} for each of the two types of shortcuts (static and dynamic).
		@@ -1388,12 +1353,6 @@ public final class ShortcutInfo implements Parcelable {
		return hasFlags(FLAG_PINNED);
		}

		/** @deprecated punted, don't use. */
		@Deprecated
		public boolean isChooser() {
		return false;
		}

		/**
		* Return whether a shortcut is static; that is, whether a shortcut is
		* published from AndroidManifest.xml. If {@code true}, the shortcut is