Merge "ShortcutManager: API changes for DR" into nyc-mr1-dev am: 8295332d83 (1b537cc6) · Commits · e / os / android_frameworks_base

api/current.txt

+22 −2

Original line number	Diff line number	Diff line
		@@ -9506,6 +9506,8 @@ package android.content.pm {

		public class LauncherApps {
		method public java.util.List<android.content.pm.LauncherActivityInfo> getActivityList(java.lang.String, android.os.UserHandle);
		method public android.graphics.drawable.Drawable getShortcutBadgedIconDrawable(int);
		method public android.graphics.drawable.Drawable getShortcutIconDrawable(int);
		method public android.os.ParcelFileDescriptor getShortcutIconFd(android.content.pm.ShortcutInfo);
		method public android.os.ParcelFileDescriptor getShortcutIconFd(java.lang.String, java.lang.String, android.os.UserHandle);
		method public java.util.List<android.content.pm.ShortcutInfo> getShortcuts(android.content.pm.LauncherApps.ShortcutQuery, android.os.UserHandle);
		@@ -10049,31 +10051,41 @@ package android.content.pm {
		method public int describeContents();
		method public android.content.ComponentName getActivityComponent();
		method public java.util.Set<java.lang.String> getCategories();
		method public java.lang.String getDisabledMessage();
		method public int getDisabledMessageResId();
		method public android.os.PersistableBundle getExtras();
		method public int getIconResourceId();
		method public java.lang.String getId();
		method public android.content.Intent getIntent();
		method public long getLastChangedTimestamp();
		method public java.lang.String getPackageName();
		method public int getRank();
		method public java.lang.String getText();
		method public int getTextResId();
		method public java.lang.String getTitle();
		method public int getTitleResId();
		method public android.os.UserHandle getUserHandle();
		method public int getWeight();
		method public boolean hasIconFile();
		method public boolean hasIconResource();
		method public boolean hasKeyFieldsOnly();
		method public boolean hasStringResourcesResolved();
		method public boolean isDisabled();
		method public boolean isDynamic();
		method public boolean isFromManifest();
		method public boolean isPinned();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final int CLONE_REMOVE_FOR_CREATOR = 1; // 0x1
		field public static final int CLONE_REMOVE_FOR_LAUNCHER = 3; // 0x3
		field public static final int CLONE_REMOVE_NON_KEY_INFO = 4; // 0x4
		field public static final android.os.Parcelable.Creator<android.content.pm.ShortcutInfo> CREATOR;
		field public static final int FLAG_DISABLED = 64; // 0x40
		field public static final int FLAG_DYNAMIC = 1; // 0x1
		field public static final int FLAG_FROM_MANIFEST = 32; // 0x20
		field public static final int FLAG_HAS_ICON_FILE = 8; // 0x8
		field public static final int FLAG_HAS_ICON_RES = 4; // 0x4
		field public static final int FLAG_KEY_FIELDS_ONLY = 16; // 0x10
		field public static final int FLAG_PINNED = 2; // 0x2
		field public static final int FLAG_STRINGS_RESOLVED = 128; // 0x80
		field public static final java.lang.String SHORTCUT_CATEGORY_CONVERSATION = "android.shortcut.conversation";
		}

		@@ -10082,17 +10094,24 @@ package android.content.pm {
		method public android.content.pm.ShortcutInfo build();
		method public android.content.pm.ShortcutInfo.Builder setActivityComponent(android.content.ComponentName);
		method public android.content.pm.ShortcutInfo.Builder setCategories(java.util.Set<java.lang.String>);
		method public android.content.pm.ShortcutInfo.Builder setDisabledMessage(java.lang.String);
		method public android.content.pm.ShortcutInfo.Builder setDisabledMessageResId(int);
		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 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 setRank(int);
		method public android.content.pm.ShortcutInfo.Builder setText(java.lang.String);
		method public android.content.pm.ShortcutInfo.Builder setTextResId(int);
		method public android.content.pm.ShortcutInfo.Builder setTitle(java.lang.String);
		method public android.content.pm.ShortcutInfo.Builder setWeight(int);
		method public android.content.pm.ShortcutInfo.Builder setTitleResId(int);
		}

		public class ShortcutManager {
		method public boolean addDynamicShortcuts(java.util.List<android.content.pm.ShortcutInfo>);
		method public void disableShortcuts(java.util.List<java.lang.String>);
		method public void disableShortcuts(java.util.List<java.lang.String>, int);
		method public void disableShortcuts(java.util.List<java.lang.String>, java.lang.String);
		method public java.util.List<android.content.pm.ShortcutInfo> getDynamicShortcuts();
		method public int getIconMaxDimensions();
		method public int getMaxDynamicShortcutCount();
		@@ -10101,6 +10120,7 @@ package android.content.pm {
		method public int getRemainingCallCount();
		method public void removeAllDynamicShortcuts();
		method public void removeDynamicShortcuts(java.util.List<java.lang.String>);
		method public void reportShortcutUsed(java.lang.String);
		method public boolean setDynamicShortcuts(java.util.List<android.content.pm.ShortcutInfo>);
		method public boolean updateShortcuts(java.util.List<android.content.pm.ShortcutInfo>);
		}

api/system-current.txt

+22 −2

Original line number	Diff line number	Diff line
		@@ -9863,6 +9863,8 @@ package android.content.pm {

		public class LauncherApps {
		method public java.util.List<android.content.pm.LauncherActivityInfo> getActivityList(java.lang.String, android.os.UserHandle);
		method public android.graphics.drawable.Drawable getShortcutBadgedIconDrawable(int);
		method public android.graphics.drawable.Drawable getShortcutIconDrawable(int);
		method public android.os.ParcelFileDescriptor getShortcutIconFd(android.content.pm.ShortcutInfo);
		method public android.os.ParcelFileDescriptor getShortcutIconFd(java.lang.String, java.lang.String, android.os.UserHandle);
		method public java.util.List<android.content.pm.ShortcutInfo> getShortcuts(android.content.pm.LauncherApps.ShortcutQuery, android.os.UserHandle);
		@@ -10476,31 +10478,41 @@ package android.content.pm {
		method public int describeContents();
		method public android.content.ComponentName getActivityComponent();
		method public java.util.Set<java.lang.String> getCategories();
		method public java.lang.String getDisabledMessage();
		method public int getDisabledMessageResId();
		method public android.os.PersistableBundle getExtras();
		method public int getIconResourceId();
		method public java.lang.String getId();
		method public android.content.Intent getIntent();
		method public long getLastChangedTimestamp();
		method public java.lang.String getPackageName();
		method public int getRank();
		method public java.lang.String getText();
		method public int getTextResId();
		method public java.lang.String getTitle();
		method public int getTitleResId();
		method public android.os.UserHandle getUserHandle();
		method public int getWeight();
		method public boolean hasIconFile();
		method public boolean hasIconResource();
		method public boolean hasKeyFieldsOnly();
		method public boolean hasStringResourcesResolved();
		method public boolean isDisabled();
		method public boolean isDynamic();
		method public boolean isFromManifest();
		method public boolean isPinned();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final int CLONE_REMOVE_FOR_CREATOR = 1; // 0x1
		field public static final int CLONE_REMOVE_FOR_LAUNCHER = 3; // 0x3
		field public static final int CLONE_REMOVE_NON_KEY_INFO = 4; // 0x4
		field public static final android.os.Parcelable.Creator<android.content.pm.ShortcutInfo> CREATOR;
		field public static final int FLAG_DISABLED = 64; // 0x40
		field public static final int FLAG_DYNAMIC = 1; // 0x1
		field public static final int FLAG_FROM_MANIFEST = 32; // 0x20
		field public static final int FLAG_HAS_ICON_FILE = 8; // 0x8
		field public static final int FLAG_HAS_ICON_RES = 4; // 0x4
		field public static final int FLAG_KEY_FIELDS_ONLY = 16; // 0x10
		field public static final int FLAG_PINNED = 2; // 0x2
		field public static final int FLAG_STRINGS_RESOLVED = 128; // 0x80
		field public static final java.lang.String SHORTCUT_CATEGORY_CONVERSATION = "android.shortcut.conversation";
		}

		@@ -10509,17 +10521,24 @@ package android.content.pm {
		method public android.content.pm.ShortcutInfo build();
		method public android.content.pm.ShortcutInfo.Builder setActivityComponent(android.content.ComponentName);
		method public android.content.pm.ShortcutInfo.Builder setCategories(java.util.Set<java.lang.String>);
		method public android.content.pm.ShortcutInfo.Builder setDisabledMessage(java.lang.String);
		method public android.content.pm.ShortcutInfo.Builder setDisabledMessageResId(int);
		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 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 setRank(int);
		method public android.content.pm.ShortcutInfo.Builder setText(java.lang.String);
		method public android.content.pm.ShortcutInfo.Builder setTextResId(int);
		method public android.content.pm.ShortcutInfo.Builder setTitle(java.lang.String);
		method public android.content.pm.ShortcutInfo.Builder setWeight(int);
		method public android.content.pm.ShortcutInfo.Builder setTitleResId(int);
		}

		public class ShortcutManager {
		method public boolean addDynamicShortcuts(java.util.List<android.content.pm.ShortcutInfo>);
		method public void disableShortcuts(java.util.List<java.lang.String>);
		method public void disableShortcuts(java.util.List<java.lang.String>, int);
		method public void disableShortcuts(java.util.List<java.lang.String>, java.lang.String);
		method public java.util.List<android.content.pm.ShortcutInfo> getDynamicShortcuts();
		method public int getIconMaxDimensions();
		method public int getMaxDynamicShortcutCount();
		@@ -10528,6 +10547,7 @@ package android.content.pm {
		method public int getRemainingCallCount();
		method public void removeAllDynamicShortcuts();
		method public void removeDynamicShortcuts(java.util.List<java.lang.String>);
		method public void reportShortcutUsed(java.lang.String);
		method public boolean setDynamicShortcuts(java.util.List<android.content.pm.ShortcutInfo>);
		method public boolean updateShortcuts(java.util.List<android.content.pm.ShortcutInfo>);
		}

api/test-current.txt

+22 −2

Original line number	Diff line number	Diff line
		@@ -9518,6 +9518,8 @@ package android.content.pm {
		public class LauncherApps {
		ctor public LauncherApps(android.content.Context);
		method public java.util.List<android.content.pm.LauncherActivityInfo> getActivityList(java.lang.String, android.os.UserHandle);
		method public android.graphics.drawable.Drawable getShortcutBadgedIconDrawable(int);
		method public android.graphics.drawable.Drawable getShortcutIconDrawable(int);
		method public android.os.ParcelFileDescriptor getShortcutIconFd(android.content.pm.ShortcutInfo);
		method public android.os.ParcelFileDescriptor getShortcutIconFd(java.lang.String, java.lang.String, android.os.UserHandle);
		method public java.util.List<android.content.pm.ShortcutInfo> getShortcuts(android.content.pm.LauncherApps.ShortcutQuery, android.os.UserHandle);
		@@ -10062,31 +10064,41 @@ package android.content.pm {
		method public int describeContents();
		method public android.content.ComponentName getActivityComponent();
		method public java.util.Set<java.lang.String> getCategories();
		method public java.lang.String getDisabledMessage();
		method public int getDisabledMessageResId();
		method public android.os.PersistableBundle getExtras();
		method public int getIconResourceId();
		method public java.lang.String getId();
		method public android.content.Intent getIntent();
		method public long getLastChangedTimestamp();
		method public java.lang.String getPackageName();
		method public int getRank();
		method public java.lang.String getText();
		method public int getTextResId();
		method public java.lang.String getTitle();
		method public int getTitleResId();
		method public android.os.UserHandle getUserHandle();
		method public int getWeight();
		method public boolean hasIconFile();
		method public boolean hasIconResource();
		method public boolean hasKeyFieldsOnly();
		method public boolean hasStringResourcesResolved();
		method public boolean isDisabled();
		method public boolean isDynamic();
		method public boolean isFromManifest();
		method public boolean isPinned();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final int CLONE_REMOVE_FOR_CREATOR = 1; // 0x1
		field public static final int CLONE_REMOVE_FOR_LAUNCHER = 3; // 0x3
		field public static final int CLONE_REMOVE_NON_KEY_INFO = 4; // 0x4
		field public static final android.os.Parcelable.Creator<android.content.pm.ShortcutInfo> CREATOR;
		field public static final int FLAG_DISABLED = 64; // 0x40
		field public static final int FLAG_DYNAMIC = 1; // 0x1
		field public static final int FLAG_FROM_MANIFEST = 32; // 0x20
		field public static final int FLAG_HAS_ICON_FILE = 8; // 0x8
		field public static final int FLAG_HAS_ICON_RES = 4; // 0x4
		field public static final int FLAG_KEY_FIELDS_ONLY = 16; // 0x10
		field public static final int FLAG_PINNED = 2; // 0x2
		field public static final int FLAG_STRINGS_RESOLVED = 128; // 0x80
		field public static final java.lang.String SHORTCUT_CATEGORY_CONVERSATION = "android.shortcut.conversation";
		}

		@@ -10095,18 +10107,25 @@ package android.content.pm {
		method public android.content.pm.ShortcutInfo build();
		method public android.content.pm.ShortcutInfo.Builder setActivityComponent(android.content.ComponentName);
		method public android.content.pm.ShortcutInfo.Builder setCategories(java.util.Set<java.lang.String>);
		method public android.content.pm.ShortcutInfo.Builder setDisabledMessage(java.lang.String);
		method public android.content.pm.ShortcutInfo.Builder setDisabledMessageResId(int);
		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 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 setRank(int);
		method public android.content.pm.ShortcutInfo.Builder setText(java.lang.String);
		method public android.content.pm.ShortcutInfo.Builder setTextResId(int);
		method public android.content.pm.ShortcutInfo.Builder setTitle(java.lang.String);
		method public android.content.pm.ShortcutInfo.Builder setWeight(int);
		method public android.content.pm.ShortcutInfo.Builder setTitleResId(int);
		}

		public class ShortcutManager {
		ctor public ShortcutManager(android.content.Context);
		method public boolean addDynamicShortcuts(java.util.List<android.content.pm.ShortcutInfo>);
		method public void disableShortcuts(java.util.List<java.lang.String>);
		method public void disableShortcuts(java.util.List<java.lang.String>, int);
		method public void disableShortcuts(java.util.List<java.lang.String>, java.lang.String);
		method public java.util.List<android.content.pm.ShortcutInfo> getDynamicShortcuts();
		method public int getIconMaxDimensions();
		method public int getMaxDynamicShortcutCount();
		@@ -10115,6 +10134,7 @@ package android.content.pm {
		method public int getRemainingCallCount();
		method public void removeAllDynamicShortcuts();
		method public void removeDynamicShortcuts(java.util.List<java.lang.String>);
		method public void reportShortcutUsed(java.lang.String);
		method public boolean setDynamicShortcuts(java.util.List<android.content.pm.ShortcutInfo>);
		method public boolean updateShortcuts(java.util.List<android.content.pm.ShortcutInfo>);
		}

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

+5 −0

Original line number	Diff line number	Diff line
		@@ -39,6 +39,9 @@ interface IShortcutService {

		boolean updateShortcuts(String packageName, in ParceledListSlice shortcuts, int userId);

		void disableShortcuts(String packageName, in List shortcutIds, String disabledMessage,
		int disabledMessageResId, int userId);

		int getMaxDynamicShortcutCount(String packageName, int userId);

		int getRemainingCallCount(String packageName, int userId);
		@@ -47,6 +50,8 @@ interface IShortcutService {

		int getIconMaxDimensions(String packageName, int userId);

		void reportShortcutUsed(String packageName, String shortcutId, int userId);

		void resetThrottling(); // system only API for developer opsions

		void onApplicationActive(String packageName, int userId); // system only API for sysUI

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

+11 −0

Original line number	Diff line number	Diff line
		@@ -25,6 +25,7 @@ import android.content.Context;
		import android.content.Intent;
		import android.content.pm.PackageManager.ApplicationInfoFlags;
		import android.graphics.Rect;
		import android.graphics.drawable.Drawable;
		import android.os.Bundle;
		import android.os.Handler;
		import android.os.Looper;
		@@ -554,6 +555,16 @@ public class LauncherApps {
		}
		}

		/** TODO Javadoc */
		public Drawable getShortcutIconDrawable(int density) {
		throw new RuntimeException("TODO implement it");
		}

		/** TODO Javadoc */
		public Drawable getShortcutBadgedIconDrawable(int density) {
		throw new RuntimeException("TODO implement it");
		}

		/**
		* Launches a shortcut.
		*