Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Implement LauncherApps.startShortcut()." into nyc-dev

Browse Source
This commit is contained in:
Makoto Onuki
2016-03-09 01:38:35 +00:00
committed by Android (Google) Code Review
parent 37a67e0bc2 43204b8357
commit 76cb56bb21
9 changed files with 49 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -9458,7 +9458,7 @@ 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 void startShortcut(android.content.pm.ShortcutInfo, android.graphics.Rect, android.os.Bundle, android.os.UserHandle);
method public boolean startShortcut(java.lang.String, java.lang.String, android.graphics.Rect, android.os.Bundle, android.os.UserHandle);
method public void unregisterCallback(android.content.pm.LauncherApps.Callback);
}

2
api/system-current.txt
View File

@@ -9792,7 +9792,7 @@ 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 void startShortcut(android.content.pm.ShortcutInfo, android.graphics.Rect, android.os.Bundle, android.os.UserHandle);
method public boolean startShortcut(java.lang.String, java.lang.String, android.graphics.Rect, android.os.Bundle, android.os.UserHandle);
method public void unregisterCallback(android.content.pm.LauncherApps.Callback);
}

2
api/test-current.txt
View File

@@ -9467,7 +9467,7 @@ 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 void startShortcut(android.content.pm.ShortcutInfo, android.graphics.Rect, android.os.Bundle, android.os.UserHandle);
method public boolean startShortcut(java.lang.String, java.lang.String, android.graphics.Rect, android.os.Bundle, android.os.UserHandle);
method public void unregisterCallback(android.content.pm.LauncherApps.Callback);
}

4
core/java/android/content/pm/ILauncherApps.aidl
View File

@@ -50,6 +50,6 @@ interface ILauncherApps {
in UserHandle user);
void pinShortcuts(String callingPackage, String packageName, in List<String> shortcutIds,
in UserHandle user);
void startShortcut(String callingPackage, in ShortcutInfo shortcut, in Rect sourceBounds,
in Bundle startActivityOptions, in UserHandle user);
boolean startShortcut(String callingPackage, String packageName, String id,
in Rect sourceBounds, in Bundle startActivityOptions, in UserHandle user);
}

11
core/java/android/content/pm/LauncherApps.java
View File

@@ -496,18 +496,21 @@ public class LauncherApps {
*
* <p>Callers mut have the {@link permission#BIND_APPWIDGET} permission.
*
* @param shortcut The target shortcut.
* @param packageName The target shortcut package name.
* @param shortcutId The target shortcut ID.
* @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.
*/
@RequiresPermission(permission.BIND_APPWIDGET)
public void startShortcut(@NonNull ShortcutInfo shortcut,
public boolean startShortcut(@NonNull String packageName, @NonNull String shortcutId,
@Nullable Rect sourceBounds, @Nullable Bundle startActivityOptions,
@NonNull UserHandle user) {
try {
mService.startShortcut(mContext.getPackageName(), shortcut, sourceBounds,
startActivityOptions, user);
return mService.startShortcut(mContext.getPackageName(), packageName, shortcutId,
sourceBounds, startActivityOptions, user);
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}

2
core/java/android/content/pm/ShortcutServiceInternal.java
View File

@@ -52,7 +52,7 @@ public abstract class ShortcutServiceInternal {
@NonNull List<String> shortcutIds, int userId);
public abstract Intent createShortcutIntent(@NonNull String callingPackage,
@NonNull ShortcutInfo shortcut, int userId);
@NonNull String packageName, @NonNull String shortcutId, int userId);
public abstract void addListener(@NonNull ShortcutChangeListener listener);
}

37
services/core/java/com/android/server/pm/LauncherAppsService.java
View File

@@ -17,6 +17,7 @@
package com.android.server.pm;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.UserIdInt;
import android.app.AppGlobals;
import android.content.ComponentName;
@@ -328,16 +329,29 @@ public class LauncherAppsService extends SystemService {
}
@Override
public void startShortcut(String callingPackage, ShortcutInfo shortcut, Rect sourceBounds,
Bundle startActivityOptions, UserHandle user) throws RemoteException {
public boolean startShortcut(String callingPackage, String packageName, String shortcutId,
Rect sourceBounds, Bundle startActivityOptions, UserHandle user)
throws RemoteException {
enforceShortcutPermission(user);
verifyCallingPackage(callingPackage);
final Intent intent = mShortcutServiceInternal.createShortcutIntent(callingPackage,
shortcut, user.getIdentifier());
// TODO
Slog.e(TAG, "startShortcut() not implemented yet, but the intent is " + intent);
throw new RuntimeException("not implemented yet");
packageName, shortcutId, user.getIdentifier());
if (intent == null) {
return false;
}
// Note the target activity doesn't have to be exported.
intent.setSourceBounds(sourceBounds);
prepareIntentForLaunch(intent, sourceBounds);
final long ident = Binder.clearCallingIdentity();
try {
mContext.startActivityAsUser(intent, startActivityOptions, user);
} finally {
Binder.restoreCallingIdentity(ident);
}
return true;
}
@Override
@@ -369,9 +383,7 @@ public class LauncherAppsService extends SystemService {
Intent launchIntent = new Intent(Intent.ACTION_MAIN);
launchIntent.addCategory(Intent.CATEGORY_LAUNCHER);
launchIntent.setSourceBounds(sourceBounds);
launchIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK
| Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED);
prepareIntentForLaunch(launchIntent, sourceBounds);
launchIntent.setPackage(component.getPackageName());
long ident = Binder.clearCallingIdentity();
@@ -408,6 +420,13 @@ public class LauncherAppsService extends SystemService {
}
}
private void prepareIntentForLaunch(@NonNull Intent launchIntent,
@Nullable Rect sourceBounds) {
launchIntent.setSourceBounds(sourceBounds);
launchIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK
| Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED);
}
@Override
public void showAppDetailsAsUser(ComponentName component, Rect sourceBounds,
Bundle opts, UserHandle user) throws RemoteException {

9
services/core/java/com/android/server/pm/ShortcutService.java
View File

@@ -1281,14 +1281,15 @@ public class ShortcutService extends IShortcutService.Stub {
@Override
public Intent createShortcutIntent(@NonNull String callingPackage,
@NonNull ShortcutInfo shortcut, int userId) {
@NonNull String packageName, @NonNull String shortcutId, int userId) {
// Calling permission must be checked by LauncherAppsImpl.
Preconditions.checkNotNull(shortcut, "shortcut");
Preconditions.checkStringNotEmpty(packageName, "packageName can't be empty");
Preconditions.checkStringNotEmpty(shortcutId, "shortcutId can't be empty");
synchronized (mLock) {
final ShortcutInfo fullShortcut =
getPackageShortcutsLocked(shortcut.getPackageName(), userId)
.getShortcuts().get(shortcut.getId());
getPackageShortcutsLocked(packageName, userId)
.getShortcuts().get(shortcutId);
if (fullShortcut == null) {
return null;
} else {

6
services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest.java
View File

@@ -1101,15 +1101,15 @@ public class ShortcutManagerTest extends AndroidTestCase {
setCaller(LAUNCHER_1);
Intent intent;
intent = mInternal.createShortcutIntent(getCallingPackage(),
s1_1.clone(ShortcutInfo.CLONE_REMOVE_NON_KEY_INFO), getCallingUserId());
CALLING_PACKAGE_1, "s1", getCallingUserId());
assertEquals(ShortcutActivity2.class.getName(), intent.getComponent().getClassName());
intent = mInternal.createShortcutIntent(getCallingPackage(),
s1_2.clone(ShortcutInfo.CLONE_REMOVE_NON_KEY_INFO), getCallingUserId());
CALLING_PACKAGE_1, "s2", getCallingUserId());
assertEquals(ShortcutActivity3.class.getName(), intent.getComponent().getClassName());
intent = mInternal.createShortcutIntent(getCallingPackage(),
s2_1.clone(ShortcutInfo.CLONE_REMOVE_NON_KEY_INFO), getCallingUserId());
CALLING_PACKAGE_2, "s1", getCallingUserId());
assertEquals(ShortcutActivity.class.getName(), intent.getComponent().getClassName());
// TODO Check extra, etc