Merge "Merge \"Address API council feedback (continued)\" into nyc-mr1-dev am:... (bd7d03ab) · Commits · e / os / android_frameworks_base

api/current.txt

+4 −5

Original line number	Diff line number	Diff line
		@@ -9529,8 +9529,8 @@ package android.content.pm {
		method public android.content.pm.LauncherActivityInfo resolveActivity(android.content.Intent, android.os.UserHandle);
		method public void startAppDetailsActivity(android.content.ComponentName, android.os.UserHandle, android.graphics.Rect, android.os.Bundle);
		method public void startMainActivity(android.content.ComponentName, android.os.UserHandle, android.graphics.Rect, android.os.Bundle);
		method public boolean startShortcut(java.lang.String, java.lang.String, android.graphics.Rect, android.os.Bundle, android.os.UserHandle);
		method public boolean startShortcut(android.content.pm.ShortcutInfo, android.graphics.Rect, android.os.Bundle);
		method public void startShortcut(java.lang.String, java.lang.String, android.graphics.Rect, android.os.Bundle, android.os.UserHandle);
		method public void startShortcut(android.content.pm.ShortcutInfo, android.graphics.Rect, android.os.Bundle);
		method public void unregisterCallback(android.content.pm.LauncherApps.Callback);
		}

		@@ -10104,14 +10104,13 @@ package android.content.pm {
		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 void disableShortcuts(java.util.List<java.lang.String>, java.lang.CharSequence);
		method public void enableShortcuts(java.util.List<java.lang.String>);
		method public java.util.List<android.content.pm.ShortcutInfo> getDynamicShortcuts();
		method public int getIconMaxHeight();
		method public int getIconMaxWidth();
		method public java.util.List<android.content.pm.ShortcutInfo> getManifestShortcuts();
		method public int getMaxShortcutCountForActivity();
		method public int getMaxShortcutCountPerActivity();
		method public java.util.List<android.content.pm.ShortcutInfo> getPinnedShortcuts();
		method public long getRateLimitResetTime();
		method public int getRemainingCallCount();

api/system-current.txt

+4 −5

Original line number	Diff line number	Diff line
		@@ -9884,8 +9884,8 @@ package android.content.pm {
		method public android.content.pm.LauncherActivityInfo resolveActivity(android.content.Intent, android.os.UserHandle);
		method public void startAppDetailsActivity(android.content.ComponentName, android.os.UserHandle, android.graphics.Rect, android.os.Bundle);
		method public void startMainActivity(android.content.ComponentName, android.os.UserHandle, android.graphics.Rect, android.os.Bundle);
		method public boolean startShortcut(java.lang.String, java.lang.String, android.graphics.Rect, android.os.Bundle, android.os.UserHandle);
		method public boolean startShortcut(android.content.pm.ShortcutInfo, android.graphics.Rect, android.os.Bundle);
		method public void startShortcut(java.lang.String, java.lang.String, android.graphics.Rect, android.os.Bundle, android.os.UserHandle);
		method public void startShortcut(android.content.pm.ShortcutInfo, android.graphics.Rect, android.os.Bundle);
		method public void unregisterCallback(android.content.pm.LauncherApps.Callback);
		}

		@@ -10529,14 +10529,13 @@ package android.content.pm {
		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 void disableShortcuts(java.util.List<java.lang.String>, java.lang.CharSequence);
		method public void enableShortcuts(java.util.List<java.lang.String>);
		method public java.util.List<android.content.pm.ShortcutInfo> getDynamicShortcuts();
		method public int getIconMaxHeight();
		method public int getIconMaxWidth();
		method public java.util.List<android.content.pm.ShortcutInfo> getManifestShortcuts();
		method public int getMaxShortcutCountForActivity();
		method public int getMaxShortcutCountPerActivity();
		method public java.util.List<android.content.pm.ShortcutInfo> getPinnedShortcuts();
		method public long getRateLimitResetTime();
		method public int getRemainingCallCount();

api/test-current.txt

+4 −5

Original line number	Diff line number	Diff line
		@@ -9541,8 +9541,8 @@ package android.content.pm {
		method public android.content.pm.LauncherActivityInfo resolveActivity(android.content.Intent, android.os.UserHandle);
		method public void startAppDetailsActivity(android.content.ComponentName, android.os.UserHandle, android.graphics.Rect, android.os.Bundle);
		method public void startMainActivity(android.content.ComponentName, android.os.UserHandle, android.graphics.Rect, android.os.Bundle);
		method public boolean startShortcut(java.lang.String, java.lang.String, android.graphics.Rect, android.os.Bundle, android.os.UserHandle);
		method public boolean startShortcut(android.content.pm.ShortcutInfo, android.graphics.Rect, android.os.Bundle);
		method public void startShortcut(java.lang.String, java.lang.String, android.graphics.Rect, android.os.Bundle, android.os.UserHandle);
		method public void startShortcut(android.content.pm.ShortcutInfo, android.graphics.Rect, android.os.Bundle);
		method public void unregisterCallback(android.content.pm.LauncherApps.Callback);
		}

		@@ -10118,14 +10118,13 @@ package android.content.pm {
		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 void disableShortcuts(java.util.List<java.lang.String>, java.lang.CharSequence);
		method public void enableShortcuts(java.util.List<java.lang.String>);
		method public java.util.List<android.content.pm.ShortcutInfo> getDynamicShortcuts();
		method public int getIconMaxHeight();
		method public int getIconMaxWidth();
		method public java.util.List<android.content.pm.ShortcutInfo> getManifestShortcuts();
		method public int getMaxShortcutCountForActivity();
		method public int getMaxShortcutCountPerActivity();
		method public java.util.List<android.content.pm.ShortcutInfo> getPinnedShortcuts();
		method public long getRateLimitResetTime();
		method public int getRemainingCallCount();

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -41,12 +41,12 @@ interface IShortcutService {

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

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

		void enableShortcuts(String packageName, in List shortcutIds, int userId);

		int getMaxShortcutCountForActivity(String packageName, int userId);
		int getMaxShortcutCountPerActivity(String packageName, int userId);

		int getRemainingCallCount(String packageName, int userId);

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

+6 −10

Original line number	Diff line number	Diff line
		@@ -651,13 +651,11 @@ public class LauncherApps {
		* @param sourceBounds The Rect containing the source bounds of the clicked icon.
		* @param startActivityOptions Options to pass to startActivity.
		* @param user The UserHandle of the profile.
		* @return {@code false} when the shortcut is no longer valid (e.g. the creator application
		* has been uninstalled). {@code true} when the shortcut is still valid.
		*/
		public boolean startShortcut(@NonNull String packageName, @NonNull String shortcutId,
		public void startShortcut(@NonNull String packageName, @NonNull String shortcutId,
		@Nullable Rect sourceBounds, @Nullable Bundle startActivityOptions,
		@NonNull UserHandle user) {
		return startShortcut(packageName, shortcutId, sourceBounds, startActivityOptions,
		startShortcut(packageName, shortcutId, sourceBounds, startActivityOptions,
		user.getIdentifier());
		}

		@@ -670,21 +668,19 @@ public class LauncherApps {
		* @param shortcut The target shortcut.
		* @param sourceBounds The Rect containing the source bounds of the clicked icon.
		* @param startActivityOptions Options to pass to startActivity.
		* @return {@code false} when the shortcut is no longer valid (e.g. the creator application
		* has been uninstalled). {@code true} when the shortcut is still valid.
		*/
		public boolean startShortcut(@NonNull ShortcutInfo shortcut,
		public void startShortcut(@NonNull ShortcutInfo shortcut,
		@Nullable Rect sourceBounds, @Nullable Bundle startActivityOptions) {
		return startShortcut(shortcut.getPackage(), shortcut.getId(),
		startShortcut(shortcut.getPackage(), shortcut.getId(),
		sourceBounds, startActivityOptions,
		shortcut.getUserId());
		}

		private boolean startShortcut(@NonNull String packageName, @NonNull String shortcutId,
		private void startShortcut(@NonNull String packageName, @NonNull String shortcutId,
		@Nullable Rect sourceBounds, @Nullable Bundle startActivityOptions,
		int userId) {
		try {
		return mService.startShortcut(mContext.getPackageName(), packageName, shortcutId,
		mService.startShortcut(mContext.getPackageName(), packageName, shortcutId,
		sourceBounds, startActivityOptions, userId);
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();