Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 76cb56bb authored by Makoto Onuki's avatar Makoto Onuki Committed by Android (Google) Code Review
Browse files

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

parents 37a67e0b 43204b83

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -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);

  }

























api/system-current.txt



+1
−1




























Original line number
Diff line number
Diff line








@@ -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);















  }







































api/test-current.txt



+1
−1




























Original line number
Diff line number
Diff line








@@ -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);















  }







































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



+2
−2




























Original line number
Diff line number
Diff line








@@ -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);















}
























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



+7
−4




























Original line number
Diff line number
Diff line








@@ -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();















        }