Merge "ShortcutManager: Support secondary text field." into nyc-dev am: ca0ee28 (4f1f7b01) · Commits · e / os / android_frameworks_base

api/current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -10004,6 +10004,7 @@ package android.content.pm {
		method public android.content.Intent getIntent();
		method public long getLastChangedTimestamp();
		method public java.lang.String getPackageName();
		method public java.lang.String getText();
		method public java.lang.String getTitle();
		method public int getWeight();
		method public boolean hasIconFile();
		@@ -10031,6 +10032,7 @@ package android.content.pm {
		method public android.content.pm.ShortcutInfo.Builder setIcon(android.graphics.drawable.Icon);
		method public 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 setText(java.lang.String);
		method public android.content.pm.ShortcutInfo.Builder setTitle(java.lang.String);
		method public android.content.pm.ShortcutInfo.Builder setWeight(int);
		}

api/system-current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -10402,6 +10402,7 @@ package android.content.pm {
		method public android.content.Intent getIntent();
		method public long getLastChangedTimestamp();
		method public java.lang.String getPackageName();
		method public java.lang.String getText();
		method public java.lang.String getTitle();
		method public int getWeight();
		method public boolean hasIconFile();
		@@ -10429,6 +10430,7 @@ package android.content.pm {
		method public android.content.pm.ShortcutInfo.Builder setIcon(android.graphics.drawable.Icon);
		method public 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 setText(java.lang.String);
		method public android.content.pm.ShortcutInfo.Builder setTitle(java.lang.String);
		method public android.content.pm.ShortcutInfo.Builder setWeight(int);
		}

api/test-current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -10014,6 +10014,7 @@ package android.content.pm {
		method public android.content.Intent getIntent();
		method public long getLastChangedTimestamp();
		method public java.lang.String getPackageName();
		method public java.lang.String getText();
		method public java.lang.String getTitle();
		method public int getWeight();
		method public boolean hasIconFile();
		@@ -10041,6 +10042,7 @@ package android.content.pm {
		method public android.content.pm.ShortcutInfo.Builder setIcon(android.graphics.drawable.Icon);
		method public 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 setText(java.lang.String);
		method public android.content.pm.ShortcutInfo.Builder setTitle(java.lang.String);
		method public android.content.pm.ShortcutInfo.Builder setWeight(int);
		}

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

+37 −2

Original line number	Diff line number	Diff line
		@@ -118,6 +118,9 @@ public class ShortcutInfo implements Parcelable {
		@NonNull
		private String mTitle;

		@Nullable
		private String mText;

		/**
		* Intent with extras removed.
		*/
		@@ -157,6 +160,7 @@ public class ShortcutInfo implements Parcelable {
		mActivityComponent = b.mActivityComponent;
		mIcon = b.mIcon;
		mTitle = b.mTitle;
		mText = b.mText;
		mIntent = b.mIntent;
		if (mIntent != null) {
		final Bundle intentExtras = mIntent.getExtras();
		@@ -176,6 +180,7 @@ public class ShortcutInfo implements Parcelable {
		* @hide
		*/
		public void enforceMandatoryFields() {
		Preconditions.checkStringNotEmpty(mId, "Shortcut ID must be provided");
		Preconditions.checkStringNotEmpty(mTitle, "Shortcut title must be provided");
		Preconditions.checkNotNull(mIntent, "Shortcut Intent must be provided");
		}
		@@ -195,16 +200,17 @@ public class ShortcutInfo implements Parcelable {
		if ((cloneFlags & CLONE_REMOVE_ICON) == 0) {
		mIcon = source.mIcon;
		mBitmapPath = source.mBitmapPath;
		mIconResourceId = source.mIconResourceId;
		}

		mTitle = source.mTitle;
		mText = source.mText;
		if ((cloneFlags & CLONE_REMOVE_INTENT) == 0) {
		mIntent = source.mIntent;
		mIntentPersistableExtras = source.mIntentPersistableExtras;
		}
		mWeight = source.mWeight;
		mExtras = source.mExtras;
		mIconResourceId = source.mIconResourceId;
		} else {
		// Set this bit.
		mFlags \|= FLAG_KEY_FIELDS_ONLY;
		@@ -244,6 +250,9 @@ public class ShortcutInfo implements Parcelable {
		if (source.mTitle != null) {
		mTitle = source.mTitle;
		}
		if (source.mText != null) {
		mText = source.mText;
		}
		if (source.mIntent != null) {
		mIntent = source.mIntent;
		mIntentPersistableExtras = source.mIntentPersistableExtras;
		@@ -305,6 +314,8 @@ public class ShortcutInfo implements Parcelable {

		private String mTitle;

		private String mText;

		private Intent mIntent;

		private int mWeight;
		@@ -367,6 +378,15 @@ public class ShortcutInfo implements Parcelable {
		return this;
		}

		/**
		* Sets the text of a shortcut. This is an optional field.
		*/
		@NonNull
		public Builder setText(@NonNull String text) {
		mText = Preconditions.checkStringNotEmpty(text, "text");
		return this;
		}

		/**
		* Sets the intent of a shortcut. This is a mandatory field. The extras must only contain
		* persistable information. (See {@link PersistableBundle}).
		@@ -456,6 +476,14 @@ public class ShortcutInfo implements Parcelable {
		return mTitle;
		}

		/**
		* Return the shortcut text.
		*/
		@Nullable
		public String getText() {
		return mText;
		}

		/**
		* Return the intent.
		*
		@@ -630,6 +658,7 @@ public class ShortcutInfo implements Parcelable {
		mActivityComponent = source.readParcelable(cl);
		mIcon = source.readParcelable(cl);
		mTitle = source.readString();
		mText = source.readString();
		mIntent = source.readParcelable(cl);
		mIntentPersistableExtras = source.readParcelable(cl);
		mWeight = source.readInt();
		@@ -647,6 +676,7 @@ public class ShortcutInfo implements Parcelable {
		dest.writeParcelable(mActivityComponent, flags);
		dest.writeParcelable(mIcon, flags);
		dest.writeString(mTitle);
		dest.writeString(mText);
		dest.writeParcelable(mIntent, flags);
		dest.writeParcelable(mIntentPersistableExtras, flags);
		dest.writeInt(mWeight);
		@@ -708,6 +738,9 @@ public class ShortcutInfo implements Parcelable {
		sb.append(", title=");
		sb.append(secure ? "***" : mTitle);

		sb.append(", text=");
		sb.append(secure ? "***" : mText);

		sb.append(", icon=");
		sb.append(mIcon);

		@@ -744,7 +777,8 @@ public class ShortcutInfo implements Parcelable {

		/** @hide */
		public ShortcutInfo(String id, String packageName, ComponentName activityComponent,
		Icon icon, String title, Intent intent, PersistableBundle intentPersistableExtras,
		Icon icon, String title, String text, Intent intent,
		PersistableBundle intentPersistableExtras,
		int weight, PersistableBundle extras, long lastChangedTimestamp,
		int flags, int iconResId, String bitmapPath) {
		mId = id;
		@@ -752,6 +786,7 @@ public class ShortcutInfo implements Parcelable {
		mActivityComponent = activityComponent;
		mIcon = icon;
		mTitle = title;
		mText = text;
		mIntent = intent;
		mIntentPersistableExtras = intentPersistableExtras;
		mWeight = weight;

services/core/java/com/android/server/pm/ShortcutPackage.java

+5 −1

Original line number	Diff line number	Diff line
		@@ -55,6 +55,7 @@ class ShortcutPackage extends ShortcutPackageItem {
		private static final String ATTR_ID = "id";
		private static final String ATTR_ACTIVITY = "activity";
		private static final String ATTR_TITLE = "title";
		private static final String ATTR_TEXT = "text";
		private static final String ATTR_INTENT = "intent";
		private static final String ATTR_WEIGHT = "weight";
		private static final String ATTR_TIMESTAMP = "timestamp";
		@@ -439,6 +440,7 @@ class ShortcutPackage extends ShortcutPackageItem {
		ShortcutService.writeAttr(out, ATTR_ACTIVITY, si.getActivityComponent());
		// writeAttr(out, "icon", si.getIcon()); // We don't save it.
		ShortcutService.writeAttr(out, ATTR_TITLE, si.getTitle());
		ShortcutService.writeAttr(out, ATTR_TEXT, si.getText());
		ShortcutService.writeAttr(out, ATTR_INTENT, si.getIntentNoExtras());
		ShortcutService.writeAttr(out, ATTR_WEIGHT, si.getWeight());
		ShortcutService.writeAttr(out, ATTR_TIMESTAMP,
		@@ -515,6 +517,7 @@ class ShortcutPackage extends ShortcutPackageItem {
		ComponentName activityComponent;
		// Icon icon;
		String title;
		String text;
		Intent intent;
		PersistableBundle intentPersistableExtras = null;
		int weight;
		@@ -528,6 +531,7 @@ class ShortcutPackage extends ShortcutPackageItem {
		activityComponent = ShortcutService.parseComponentNameAttribute(parser,
		ATTR_ACTIVITY);
		title = ShortcutService.parseStringAttribute(parser, ATTR_TITLE);
		text = ShortcutService.parseStringAttribute(parser, ATTR_TEXT);
		intent = ShortcutService.parseIntentAttribute(parser, ATTR_INTENT);
		weight = (int) ShortcutService.parseLongAttribute(parser, ATTR_WEIGHT);
		lastChangedTimestamp = ShortcutService.parseLongAttribute(parser, ATTR_TIMESTAMP);
		@@ -559,7 +563,7 @@ class ShortcutPackage extends ShortcutPackageItem {
		throw ShortcutService.throwForInvalidTag(depth, tag);
		}
		return new ShortcutInfo(
		id, packageName, activityComponent, /* icon =*/ null, title, intent,
		id, packageName, activityComponent, /* icon =*/ null, title, text, intent,
		intentPersistableExtras, weight, extras, lastChangedTimestamp, flags,
		iconRes, bitmapPath);
		}