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

Commit 2d895c3e authored by Makoto Onuki's avatar Makoto Onuki
Browse files

ShortcutManager: direct pin shortcut support. 

Test: Manual test and all the unit tests:
adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest1 -w com.android.frameworks.servicestests
... to test8

Bug 32908854

Change-Id: I11b81656959cccfb4efa83f08380b915e6eb84a6
parent 54365465

Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -144,6 +144,7 @@ LOCAL_SRC_FILES += \ 
	core/java/android/content/ISyncStatusObserver.aidl \

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

	core/java/android/content/pm/IOnAppsChangedListener.aidl \

	core/java/android/content/pm/IOnPermissionsChangeListener.aidl \

	core/java/android/content/pm/IOtaDexopt.aidl \

	core/java/android/content/pm/IPackageDataObserver.aidl \

	core/java/android/content/pm/IPackageDeleteObserver.aidl \
@@ -156,7 +157,7 @@ LOCAL_SRC_FILES += \ 
	core/java/android/content/pm/IPackageManager.aidl \

	core/java/android/content/pm/IPackageMoveObserver.aidl \

	core/java/android/content/pm/IPackageStatsObserver.aidl \

	core/java/android/content/pm/IOnPermissionsChangeListener.aidl \

	core/java/android/content/pm/IPinItemRequest.aidl \

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

	core/java/android/content/pm/permission/IRuntimePermissionPresenter.aidl \

	core/java/android/database/IContentObserver.aidl \

api/current.txt

+20 −0
Original line number Diff line number Diff line
@@ -9648,6 +9648,7 @@ 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.content.pm.LauncherApps.PinItemRequest getPinItemRequest(android.content.Intent);















    method public android.graphics.drawable.Drawable getShortcutBadgedIconDrawable(android.content.pm.ShortcutInfo, int);















    method public android.graphics.drawable.Drawable getShortcutIconDrawable(android.content.pm.ShortcutInfo, int);















    method public java.util.List<android.content.pm.ShortcutInfo> getShortcuts(android.content.pm.LauncherApps.ShortcutQuery, android.os.UserHandle);









@@ -9663,6 +9664,8 @@ package android.content.pm {













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













    field public static final java.lang.String ACTION_CONFIRM_PIN_ITEM = "android.content.pm.action.CONFIRM_PIN_ITEM";













    field public static final java.lang.String EXTRA_PIN_ITEM_REQUEST = "android.content.pm.extra.PIN_ITEM_REQUEST";















  }





























  public static abstract class LauncherApps.Callback {









@@ -9677,6 +9680,21 @@ package android.content.pm {













    method public void onShortcutsChanged(java.lang.String, java.util.List<android.content.pm.ShortcutInfo>, android.os.UserHandle);















  }



























  public static final class LauncherApps.PinItemRequest implements android.os.Parcelable {













    method public boolean accept(android.os.Bundle);













    method public boolean accept();













    method public int describeContents();













    method public int getRequestType();













    method public android.content.pm.ShortcutInfo getShortcutInfo();













    method public boolean isValid();













    method public void writeToParcel(android.os.Parcel, int);













    field public static final android.os.Parcelable.Creator<android.content.pm.LauncherApps.PinItemRequest> CREATOR;













    field public static final int REQUEST_TYPE_SHORTCUT = 1; // 0x1













  }

























  public static abstract class LauncherApps.PinItemRequest.RequestType implements java.lang.annotation.Annotation {













  }



























  public static class LauncherApps.ShortcutQuery {















    ctor public LauncherApps.ShortcutQuery();















    method public android.content.pm.LauncherApps.ShortcutQuery setActivity(android.content.ComponentName);










@@ -10241,9 +10259,11 @@ package android.content.pm {













    method public int getMaxShortcutCountPerActivity();















    method public java.util.List<android.content.pm.ShortcutInfo> getPinnedShortcuts();















    method public boolean isRateLimitingActive();













    method public boolean isRequestPinShortcutSupported();















    method public void removeAllDynamicShortcuts();















    method public void removeDynamicShortcuts(java.util.List<java.lang.String>);















    method public void reportShortcutUsed(java.lang.String);













    method public boolean requestPinShortcut(android.content.pm.ShortcutInfo, android.content.IntentSender);















    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



+20
−0




























Original line number
Diff line number
Diff line








@@ -10048,6 +10048,7 @@ 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.content.pm.LauncherApps.PinItemRequest getPinItemRequest(android.content.Intent);















    method public android.graphics.drawable.Drawable getShortcutBadgedIconDrawable(android.content.pm.ShortcutInfo, int);















    method public android.graphics.drawable.Drawable getShortcutIconDrawable(android.content.pm.ShortcutInfo, int);















    method public java.util.List<android.content.pm.ShortcutInfo> getShortcuts(android.content.pm.LauncherApps.ShortcutQuery, android.os.UserHandle);









@@ -10063,6 +10064,8 @@ package android.content.pm {













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













    field public static final java.lang.String ACTION_CONFIRM_PIN_ITEM = "android.content.pm.action.CONFIRM_PIN_ITEM";













    field public static final java.lang.String EXTRA_PIN_ITEM_REQUEST = "android.content.pm.extra.PIN_ITEM_REQUEST";















  }





























  public static abstract class LauncherApps.Callback {









@@ -10077,6 +10080,21 @@ package android.content.pm {













    method public void onShortcutsChanged(java.lang.String, java.util.List<android.content.pm.ShortcutInfo>, android.os.UserHandle);















  }



























  public static final class LauncherApps.PinItemRequest implements android.os.Parcelable {













    method public boolean accept(android.os.Bundle);













    method public boolean accept();













    method public int describeContents();













    method public int getRequestType();













    method public android.content.pm.ShortcutInfo getShortcutInfo();













    method public boolean isValid();













    method public void writeToParcel(android.os.Parcel, int);













    field public static final android.os.Parcelable.Creator<android.content.pm.LauncherApps.PinItemRequest> CREATOR;













    field public static final int REQUEST_TYPE_SHORTCUT = 1; // 0x1













  }

























  public static abstract class LauncherApps.PinItemRequest.RequestType implements java.lang.annotation.Annotation {













  }



























  public static class LauncherApps.ShortcutQuery {















    ctor public LauncherApps.ShortcutQuery();















    method public android.content.pm.LauncherApps.ShortcutQuery setActivity(android.content.ComponentName);










@@ -10712,9 +10730,11 @@ package android.content.pm {













    method public int getMaxShortcutCountPerActivity();















    method public java.util.List<android.content.pm.ShortcutInfo> getPinnedShortcuts();















    method public boolean isRateLimitingActive();













    method public boolean isRequestPinShortcutSupported();















    method public void removeAllDynamicShortcuts();















    method public void removeDynamicShortcuts(java.util.List<java.lang.String>);















    method public void reportShortcutUsed(java.lang.String);













    method public boolean requestPinShortcut(android.content.pm.ShortcutInfo, android.content.IntentSender);















    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



+20
−0




























Original line number
Diff line number
Diff line








@@ -9676,6 +9676,7 @@ 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.content.pm.LauncherApps.PinItemRequest getPinItemRequest(android.content.Intent);















    method public android.graphics.drawable.Drawable getShortcutBadgedIconDrawable(android.content.pm.ShortcutInfo, int);















    method public android.graphics.drawable.Drawable getShortcutIconDrawable(android.content.pm.ShortcutInfo, int);















    method public java.util.List<android.content.pm.ShortcutInfo> getShortcuts(android.content.pm.LauncherApps.ShortcutQuery, android.os.UserHandle);









@@ -9691,6 +9692,8 @@ package android.content.pm {













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













    field public static final java.lang.String ACTION_CONFIRM_PIN_ITEM = "android.content.pm.action.CONFIRM_PIN_ITEM";













    field public static final java.lang.String EXTRA_PIN_ITEM_REQUEST = "android.content.pm.extra.PIN_ITEM_REQUEST";















  }





























  public static abstract class LauncherApps.Callback {









@@ -9705,6 +9708,21 @@ package android.content.pm {













    method public void onShortcutsChanged(java.lang.String, java.util.List<android.content.pm.ShortcutInfo>, android.os.UserHandle);















  }



























  public static final class LauncherApps.PinItemRequest implements android.os.Parcelable {













    method public boolean accept(android.os.Bundle);













    method public boolean accept();













    method public int describeContents();













    method public int getRequestType();













    method public android.content.pm.ShortcutInfo getShortcutInfo();













    method public boolean isValid();













    method public void writeToParcel(android.os.Parcel, int);













    field public static final android.os.Parcelable.Creator<android.content.pm.LauncherApps.PinItemRequest> CREATOR;













    field public static final int REQUEST_TYPE_SHORTCUT = 1; // 0x1













  }

























  public static abstract class LauncherApps.PinItemRequest.RequestType implements java.lang.annotation.Annotation {













  }



























  public static class LauncherApps.ShortcutQuery {















    ctor public LauncherApps.ShortcutQuery();















    method public android.content.pm.LauncherApps.ShortcutQuery setActivity(android.content.ComponentName);










@@ -10272,9 +10290,11 @@ package android.content.pm {













    method public int getMaxShortcutCountPerActivity();















    method public java.util.List<android.content.pm.ShortcutInfo> getPinnedShortcuts();















    method public boolean isRateLimitingActive();













    method public boolean isRequestPinShortcutSupported();















    method public void removeAllDynamicShortcuts();















    method public void removeDynamicShortcuts(java.util.List<java.lang.String>);















    method public void reportShortcutUsed(java.lang.String);













    method public boolean requestPinShortcut(android.content.pm.ShortcutInfo, android.content.IntentSender);















    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/IPinItemRequest.aidl
0 → 100644



+26
−0




























Original line number
Diff line number
Diff line













/*













 * Copyright (C) 2016 The Android Open Source Project













 *













 * Licensed under the Apache License, Version 2.0 (the "License");













 * you may not use this file except in compliance with the License.













 * You may obtain a copy of the License at













 *













 *      http://www.apache.org/licenses/LICENSE-2.0













 *













 * Unless required by applicable law or agreed to in writing, software













 * distributed under the License is distributed on an "AS IS" BASIS,













 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.













 * See the License for the specific language governing permissions and













 * limitations under the License.













 */













package android.content.pm;



























import android.os.Bundle;



























/**













 * {@hide}













 */













interface IPinItemRequest {













    boolean isValid();













    boolean accept(in Bundle options);













}