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

Commit 1fcd0c71 authored by Sihua Ma's avatar Sihua Ma Committed by Android Build Coastguard Worker
Browse files

Revert "Deprecate notifyAppWidgetViewDataChanged" 

This reverts commit e6140481.

Reason for revert: Delay @Deprecated annotation
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:9bed3e0364c87c75f80d7f356ec89122a2396744)
Merged-In: I6714a25a77e54eaac3f0953e58298385650bd55e
Change-Id: I6714a25a77e54eaac3f0953e58298385650bd55e
parent c88338e5

core/api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -9478,8 +9478,8 @@ package android.appwidget { 
    method @NonNull public java.util.List<android.appwidget.AppWidgetProviderInfo> getInstalledProvidersForProfile(@Nullable android.os.UserHandle);

    method public static android.appwidget.AppWidgetManager getInstance(android.content.Context);

    method public boolean isRequestPinAppWidgetSupported();

    method @Deprecated public void notifyAppWidgetViewDataChanged(int[], int);

    method @Deprecated public void notifyAppWidgetViewDataChanged(int, int);

    method public void notifyAppWidgetViewDataChanged(int[], int);

    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(@NonNull android.content.ComponentName, @Nullable android.os.Bundle, @Nullable android.app.PendingIntent);

core/java/android/appwidget/AppWidgetManager.java

+2 −24
Original line number Diff line number Diff line
@@ -820,18 +820,7 @@ public class AppWidgetManager { 
     *

     * @param appWidgetIds  The AppWidget instances to notify of view data changes.

     * @param viewId        The collection view id.

     * @deprecated The corresponding API

     * {@link RemoteViews#setRemoteAdapter(int, Intent)} associated with this method has been

     * deprecated. Moving forward please use

     * {@link RemoteViews#setRemoteAdapter(int, android.widget.RemoteViews.RemoteCollectionItems)}

     * instead to set {@link android.widget.RemoteViews.RemoteCollectionItems} for the remote

     * adapter and update the widget views by calling {@link #updateAppWidget(int[], RemoteViews)},

     * {@link #updateAppWidget(int, RemoteViews)},

     * {@link #updateAppWidget(ComponentName, RemoteViews)},

     * {@link #partiallyUpdateAppWidget(int[], RemoteViews)},

     * or {@link #partiallyUpdateAppWidget(int, RemoteViews)}, whichever applicable.

     */

    @Deprecated

     */

    public void notifyAppWidgetViewDataChanged(int[] appWidgetIds, int viewId) {

        if (mService == null) {

            return;
@@ -882,18 +871,7 @@ public class AppWidgetManager { 
     *

     * @param appWidgetId  The AppWidget instance to notify of view data changes.

     * @param viewId       The collection view id.

     * @deprecated The corresponding API

     * {@link RemoteViews#setRemoteAdapter(int, Intent)} associated with this method has been

     * deprecated. Moving forward please use

     * {@link RemoteViews#setRemoteAdapter(int, android.widget.RemoteViews.RemoteCollectionItems)}

     * instead to set {@link android.widget.RemoteViews.RemoteCollectionItems} for the remote

     * adapter and update the widget views by calling {@link #updateAppWidget(int[], RemoteViews)},

     * {@link #updateAppWidget(int, RemoteViews)},

     * {@link #updateAppWidget(ComponentName, RemoteViews)},

     * {@link #partiallyUpdateAppWidget(int[], RemoteViews)},

     * or {@link #partiallyUpdateAppWidget(int, RemoteViews)}, whichever applicable.

     */

    @Deprecated

     */

    public void notifyAppWidgetViewDataChanged(int appWidgetId, int viewId) {

        if (mService == null) {

            return;