Merge "Hide APIs that shouldn't have been public" into nyc-mr1-dev (8317f930) · Commits · e / os / android_frameworks_base

api/current.txt

+0 −5

Original line number	Diff line number	Diff line
		@@ -10063,17 +10063,14 @@ package android.content.pm {
		method public android.content.ComponentName getActivity();
		method public java.util.Set<java.lang.String> getCategories();
		method public java.lang.CharSequence getDisabledMessage();
		method public int getDisabledMessageResourceId();
		method public android.os.PersistableBundle getExtras();
		method public java.lang.String getId();
		method public android.content.Intent getIntent();
		method public long getLastChangedTimestamp();
		method public java.lang.CharSequence getLongLabel();
		method public int getLongLabelResourceId();
		method public java.lang.String getPackage();
		method public int getRank();
		method public java.lang.CharSequence getShortLabel();
		method public int getShortLabelResourceId();
		method public android.os.UserHandle getUserHandle();
		method public boolean hasKeyFieldsOnly();
		method public boolean isDeclaredInManifest();
		@@ -10087,7 +10084,6 @@ package android.content.pm {
		}

		public static class ShortcutInfo.Builder {
		ctor public deprecated ShortcutInfo.Builder(android.content.Context);
		ctor public ShortcutInfo.Builder(android.content.Context, java.lang.String);
		method public android.content.pm.ShortcutInfo build();
		method public android.content.pm.ShortcutInfo.Builder setActivity(android.content.ComponentName);
		@@ -10095,7 +10091,6 @@ package android.content.pm {
		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);
		method public deprecated android.content.pm.ShortcutInfo.Builder setId(java.lang.String);
		method public android.content.pm.ShortcutInfo.Builder setIntent(android.content.Intent);
		method public android.content.pm.ShortcutInfo.Builder setLongLabel(java.lang.CharSequence);
		method public android.content.pm.ShortcutInfo.Builder setRank(int);

api/system-current.txt

+0 −5

Original line number	Diff line number	Diff line
		@@ -10488,17 +10488,14 @@ package android.content.pm {
		method public android.content.ComponentName getActivity();
		method public java.util.Set<java.lang.String> getCategories();
		method public java.lang.CharSequence getDisabledMessage();
		method public int getDisabledMessageResourceId();
		method public android.os.PersistableBundle getExtras();
		method public java.lang.String getId();
		method public android.content.Intent getIntent();
		method public long getLastChangedTimestamp();
		method public java.lang.CharSequence getLongLabel();
		method public int getLongLabelResourceId();
		method public java.lang.String getPackage();
		method public int getRank();
		method public java.lang.CharSequence getShortLabel();
		method public int getShortLabelResourceId();
		method public android.os.UserHandle getUserHandle();
		method public boolean hasKeyFieldsOnly();
		method public boolean isDeclaredInManifest();
		@@ -10512,7 +10509,6 @@ package android.content.pm {
		}

		public static class ShortcutInfo.Builder {
		ctor public deprecated ShortcutInfo.Builder(android.content.Context);
		ctor public ShortcutInfo.Builder(android.content.Context, java.lang.String);
		method public android.content.pm.ShortcutInfo build();
		method public android.content.pm.ShortcutInfo.Builder setActivity(android.content.ComponentName);
		@@ -10520,7 +10516,6 @@ package android.content.pm {
		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);
		method public deprecated android.content.pm.ShortcutInfo.Builder setId(java.lang.String);
		method public android.content.pm.ShortcutInfo.Builder setIntent(android.content.Intent);
		method public android.content.pm.ShortcutInfo.Builder setLongLabel(java.lang.CharSequence);
		method public android.content.pm.ShortcutInfo.Builder setRank(int);

api/test-current.txt

+0 −5

Original line number	Diff line number	Diff line
		@@ -10076,17 +10076,14 @@ package android.content.pm {
		method public android.content.ComponentName getActivity();
		method public java.util.Set<java.lang.String> getCategories();
		method public java.lang.CharSequence getDisabledMessage();
		method public int getDisabledMessageResourceId();
		method public android.os.PersistableBundle getExtras();
		method public java.lang.String getId();
		method public android.content.Intent getIntent();
		method public long getLastChangedTimestamp();
		method public java.lang.CharSequence getLongLabel();
		method public int getLongLabelResourceId();
		method public java.lang.String getPackage();
		method public int getRank();
		method public java.lang.CharSequence getShortLabel();
		method public int getShortLabelResourceId();
		method public android.os.UserHandle getUserHandle();
		method public boolean hasKeyFieldsOnly();
		method public boolean isDeclaredInManifest();
		@@ -10100,7 +10097,6 @@ package android.content.pm {
		}

		public static class ShortcutInfo.Builder {
		ctor public deprecated ShortcutInfo.Builder(android.content.Context);
		ctor public ShortcutInfo.Builder(android.content.Context, java.lang.String);
		method public android.content.pm.ShortcutInfo build();
		method public android.content.pm.ShortcutInfo.Builder setActivity(android.content.ComponentName);
		@@ -10108,7 +10104,6 @@ package android.content.pm {
		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);
		method public deprecated android.content.pm.ShortcutInfo.Builder setId(java.lang.String);
		method public android.content.pm.ShortcutInfo.Builder setIntent(android.content.Intent);
		method public android.content.pm.ShortcutInfo.Builder setLongLabel(java.lang.CharSequence);
		method public android.content.pm.ShortcutInfo.Builder setRank(int);

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

+7 −5

Original line number	Diff line number	Diff line
		@@ -696,7 +696,8 @@ public final class ShortcutInfo implements Parcelable {
		private PersistableBundle mExtras;

		/**
		* Old style constructor. STOPSHIP hide it before launch.
		* Old style constructor.
		* @hide
		*/
		@Deprecated
		public Builder(Context context) {
		@@ -704,7 +705,8 @@ public final class ShortcutInfo implements Parcelable {
		}

		/**
		* Used with the old style constructor, kept for unit tests. STOPSHIP hide it before launch.
		* Used with the old style constructor, kept for unit tests.
		* @hide
		*/
		@NonNull
		@Deprecated
		@@ -1004,7 +1006,7 @@ public final class ShortcutInfo implements Parcelable {
		return mTitle;
		}

		/** TODO Javadoc */
		/** @hide */
		public int getShortLabelResourceId() {
		return mTitleResId;
		}
		@@ -1017,7 +1019,7 @@ public final class ShortcutInfo implements Parcelable {
		return mText;
		}

		/** TODO Javadoc */
		/** @hide */
		public int getLongLabelResourceId() {
		return mTextResId;
		}
		@@ -1030,7 +1032,7 @@ public final class ShortcutInfo implements Parcelable {
		return mDisabledMessage;
		}

		/** TODO Javadoc */
		/** @hide */
		public int getDisabledMessageResourceId() {
		return mDisabledMessageResId;
		}