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

Commit 4ad6b577 authored by Sunny Goyal's avatar Sunny Goyal
Browse files

Adding support for passing arbitrary extras when requesting to pin a widget. 

Also defining an extra constant for widget preview which can be used by
developers to provide a snapshot of the widget with the pin request

Bug: 35811129
Test: All exisiting tests passing
 for f in 1 2 3 4 5 6 7 8 9 10; do \
   adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest$f \
      -w com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner; \
        done;

 adb shell am instrument -e class com.android.server.appwidget.AppWidgetServiceImplTest \
   -w com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner

Change-Id: Id854bd28468a5bf0416ff1a1b19c44d850016f32
parent 195bbc6d

api/current.txt

+4 −2
Original line number Diff line number Diff line
@@ -6994,7 +6994,7 @@ package android.appwidget { 
    method public void notifyAppWidgetViewDataChanged(int, int);

    method public void partiallyUpdateAppWidget(int[], android.widget.RemoteViews);

    method public void partiallyUpdateAppWidget(int, android.widget.RemoteViews);

    method public boolean requestPinAppWidget(android.content.ComponentName, android.app.PendingIntent);

    method public boolean requestPinAppWidget(android.content.ComponentName, android.os.Bundle, android.app.PendingIntent);

    method public void updateAppWidget(int[], android.widget.RemoteViews);

    method public void updateAppWidget(int, android.widget.RemoteViews);

    method public void updateAppWidget(android.content.ComponentName, android.widget.RemoteViews);
@@ -7013,6 +7013,7 @@ package android.appwidget { 
    field public static final java.lang.String EXTRA_APPWIDGET_IDS = "appWidgetIds";

    field public static final java.lang.String EXTRA_APPWIDGET_OLD_IDS = "appWidgetOldIds";

    field public static final java.lang.String EXTRA_APPWIDGET_OPTIONS = "appWidgetOptions";

    field public static final java.lang.String EXTRA_APPWIDGET_PREVIEW = "appWidgetPreview";

    field public static final java.lang.String EXTRA_APPWIDGET_PROVIDER = "appWidgetProvider";

    field public static final java.lang.String EXTRA_APPWIDGET_PROVIDER_PROFILE = "appWidgetProviderProfile";

    field public static final java.lang.String EXTRA_CUSTOM_EXTRAS = "customExtras";
@@ -10095,6 +10096,7 @@ package android.content.pm { 
    method public boolean accept();

    method public int describeContents();

    method public android.appwidget.AppWidgetProviderInfo getAppWidgetProviderInfo(android.content.Context);

    method public android.os.Bundle getExtras();

    method public int getRequestType();

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

    method public boolean isValid();
@@ -30125,12 +30127,12 @@ package android.os { 
    field public static final int BATTERY_PLUGGED_AC = 1; // 0x1

    field public static final int BATTERY_PLUGGED_USB = 2; // 0x2

    field public static final int BATTERY_PLUGGED_WIRELESS = 4; // 0x4

    field public static final int BATTERY_PROPERTY_STATUS = 6; // 0x6

    field public static final int BATTERY_PROPERTY_CAPACITY = 4; // 0x4

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

    field public static final int BATTERY_PROPERTY_CURRENT_AVERAGE = 3; // 0x3

    field public static final int BATTERY_PROPERTY_CURRENT_NOW = 2; // 0x2

    field public static final int BATTERY_PROPERTY_ENERGY_COUNTER = 5; // 0x5

    field public static final int BATTERY_PROPERTY_STATUS = 6; // 0x6

    field public static final int BATTERY_STATUS_CHARGING = 2; // 0x2

    field public static final int BATTERY_STATUS_DISCHARGING = 3; // 0x3

    field public static final int BATTERY_STATUS_FULL = 5; // 0x5

api/system-current.txt

+4 −2
Original line number Diff line number Diff line
@@ -7417,7 +7417,7 @@ package android.appwidget { 
    method public void notifyAppWidgetViewDataChanged(int, int);

    method public void partiallyUpdateAppWidget(int[], android.widget.RemoteViews);

    method public void partiallyUpdateAppWidget(int, android.widget.RemoteViews);

    method public boolean requestPinAppWidget(android.content.ComponentName, android.app.PendingIntent);

    method public boolean requestPinAppWidget(android.content.ComponentName, android.os.Bundle, android.app.PendingIntent);

    method public void updateAppWidget(int[], android.widget.RemoteViews);

    method public void updateAppWidget(int, android.widget.RemoteViews);

    method public void updateAppWidget(android.content.ComponentName, android.widget.RemoteViews);
@@ -7436,6 +7436,7 @@ package android.appwidget { 
    field public static final java.lang.String EXTRA_APPWIDGET_IDS = "appWidgetIds";

    field public static final java.lang.String EXTRA_APPWIDGET_OLD_IDS = "appWidgetOldIds";

    field public static final java.lang.String EXTRA_APPWIDGET_OPTIONS = "appWidgetOptions";

    field public static final java.lang.String EXTRA_APPWIDGET_PREVIEW = "appWidgetPreview";

    field public static final java.lang.String EXTRA_APPWIDGET_PROVIDER = "appWidgetProvider";

    field public static final java.lang.String EXTRA_APPWIDGET_PROVIDER_PROFILE = "appWidgetProviderProfile";

    field public static final java.lang.String EXTRA_CUSTOM_EXTRAS = "customExtras";
@@ -10632,6 +10633,7 @@ package android.content.pm { 
    method public boolean accept();

    method public int describeContents();

    method public android.appwidget.AppWidgetProviderInfo getAppWidgetProviderInfo(android.content.Context);

    method public android.os.Bundle getExtras();

    method public int getRequestType();

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

    method public boolean isValid();
@@ -32727,12 +32729,12 @@ package android.os { 
    field public static final int BATTERY_PLUGGED_AC = 1; // 0x1

    field public static final int BATTERY_PLUGGED_USB = 2; // 0x2

    field public static final int BATTERY_PLUGGED_WIRELESS = 4; // 0x4

    field public static final int BATTERY_PROPERTY_STATUS = 6; // 0x6

    field public static final int BATTERY_PROPERTY_CAPACITY = 4; // 0x4

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

    field public static final int BATTERY_PROPERTY_CURRENT_AVERAGE = 3; // 0x3

    field public static final int BATTERY_PROPERTY_CURRENT_NOW = 2; // 0x2

    field public static final int BATTERY_PROPERTY_ENERGY_COUNTER = 5; // 0x5

    field public static final int BATTERY_PROPERTY_STATUS = 6; // 0x6

    field public static final int BATTERY_STATUS_CHARGING = 2; // 0x2

    field public static final int BATTERY_STATUS_DISCHARGING = 3; // 0x3

    field public static final int BATTERY_STATUS_FULL = 5; // 0x5

api/test-current.txt

+4 −2
Original line number Diff line number Diff line
@@ -7020,7 +7020,7 @@ package android.appwidget { 
    method public void notifyAppWidgetViewDataChanged(int, int);

    method public void partiallyUpdateAppWidget(int[], android.widget.RemoteViews);

    method public void partiallyUpdateAppWidget(int, android.widget.RemoteViews);

    method public boolean requestPinAppWidget(android.content.ComponentName, android.app.PendingIntent);

    method public boolean requestPinAppWidget(android.content.ComponentName, android.os.Bundle, android.app.PendingIntent);

    method public void updateAppWidget(int[], android.widget.RemoteViews);

    method public void updateAppWidget(int, android.widget.RemoteViews);

    method public void updateAppWidget(android.content.ComponentName, android.widget.RemoteViews);
@@ -7039,6 +7039,7 @@ package android.appwidget { 
    field public static final java.lang.String EXTRA_APPWIDGET_IDS = "appWidgetIds";

    field public static final java.lang.String EXTRA_APPWIDGET_OLD_IDS = "appWidgetOldIds";

    field public static final java.lang.String EXTRA_APPWIDGET_OPTIONS = "appWidgetOptions";

    field public static final java.lang.String EXTRA_APPWIDGET_PREVIEW = "appWidgetPreview";

    field public static final java.lang.String EXTRA_APPWIDGET_PROVIDER = "appWidgetProvider";

    field public static final java.lang.String EXTRA_APPWIDGET_PROVIDER_PROFILE = "appWidgetProviderProfile";

    field public static final java.lang.String EXTRA_CUSTOM_EXTRAS = "customExtras";
@@ -10127,6 +10128,7 @@ package android.content.pm { 
    method public boolean accept();

    method public int describeContents();

    method public android.appwidget.AppWidgetProviderInfo getAppWidgetProviderInfo(android.content.Context);

    method public android.os.Bundle getExtras();

    method public int getRequestType();

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

    method public boolean isValid();
@@ -30221,12 +30223,12 @@ package android.os { 
    field public static final int BATTERY_PLUGGED_AC = 1; // 0x1

    field public static final int BATTERY_PLUGGED_USB = 2; // 0x2

    field public static final int BATTERY_PLUGGED_WIRELESS = 4; // 0x4

    field public static final int BATTERY_PROPERTY_STATUS = 6; // 0x6

    field public static final int BATTERY_PROPERTY_CAPACITY = 4; // 0x4

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

    field public static final int BATTERY_PROPERTY_CURRENT_AVERAGE = 3; // 0x3

    field public static final int BATTERY_PROPERTY_CURRENT_NOW = 2; // 0x2

    field public static final int BATTERY_PROPERTY_ENERGY_COUNTER = 5; // 0x5

    field public static final int BATTERY_PROPERTY_STATUS = 6; // 0x6

    field public static final int BATTERY_STATUS_CHARGING = 2; // 0x2

    field public static final int BATTERY_STATUS_DISCHARGING = 3; // 0x3

    field public static final int BATTERY_STATUS_FULL = 5; // 0x5

core/java/android/appwidget/AppWidgetManager.java

+26 −4
Original line number Diff line number Diff line
@@ -416,6 +416,17 @@ public class AppWidgetManager { 
     */

    public static final String EXTRA_APPWIDGET_OLD_IDS = "appWidgetOldIds";



    /**

     * An extra that can be passed to

     * {@link #requestPinAppWidget(ComponentName, Bundle, PendingIntent)}. This would allow the

     * launcher app to present a custom preview to the user.

     *

     * <p>

     * The value should be a {@link RemoteViews} similar to what is used with

     * {@link #updateAppWidget} calls.

     */

    public static final String EXTRA_APPWIDGET_PREVIEW = "appWidgetPreview";



    /**

     * Field for the manifest meta-data tag.

     *
@@ -1073,7 +1084,7 @@ public class AppWidgetManager { 


    /**

     * Return {@code TRUE} if the default launcher supports

     * {@link #requestPinAppWidget(ComponentName, PendingIntent)}

     * {@link #requestPinAppWidget(ComponentName, Bundle, PendingIntent)}

     */

    public boolean isRequestPinAppWidgetSupported() {

        try {
@@ -1083,6 +1094,15 @@ public class AppWidgetManager { 
        }

    }



    /**

     * Only used during development. Can be deleted before release.

     * @hide

     */

    public boolean requestPinAppWidget(@NonNull ComponentName provider,

            @Nullable PendingIntent successCallback) {

        return requestPinAppWidget(provider, null, successCallback);

    }



    /**

     * Request to pin an app widget on the current launcher. It's up to the launcher to accept this

     * request (optionally showing a user confirmation). If the request is accepted, the caller will
@@ -1099,6 +1119,8 @@ public class AppWidgetManager { 
     *

     * @param provider The {@link ComponentName} for the {@link

     *    android.content.BroadcastReceiver BroadcastReceiver} provider for your AppWidget.

     * @param extras In not null, this is passed to the launcher app. For eg {@link

     *    #EXTRA_APPWIDGET_PREVIEW} can be used for a custom preview.

     * @param successCallback If not null, this intent will be sent when the widget is created.

     *

     * @return {@code TRUE} if the launcher supports this feature. Note the API will return without
@@ -1113,9 +1135,9 @@ public class AppWidgetManager { 
     * service or when the user is locked.

     */

    public boolean requestPinAppWidget(@NonNull ComponentName provider,

            @Nullable PendingIntent successCallback) {

            @Nullable Bundle extras, @Nullable PendingIntent successCallback) {

        try {

            return mService.requestPinAppWidget(mPackageName, provider,

            return mService.requestPinAppWidget(mPackageName, provider, extras,

                    successCallback == null ? null : successCallback.getIntentSender());

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

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

+1 −0
Original line number Diff line number Diff line
@@ -27,4 +27,5 @@ interface IPinItemRequest { 
    boolean accept(in Bundle options);

    ShortcutInfo getShortcutInfo();

    AppWidgetProviderInfo getAppWidgetProviderInfo();

    Bundle getExtras();

}