summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSihua Ma <sihua@google.com>2024-01-12 00:13:58 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2024-02-06 21:14:01 +0000
commit1fcd0c7132d836c6ab5aaee5a0f834810beff4ee (patch)
tree77d11d59570e753b76f5595b456047044e4b17b8
parentc88338e565fd4bd171d5a859ccf1401fa4c7ce0c (diff)
downloadbase-1fcd0c7132d836c6ab5aaee5a0f834810beff4ee.tar.gz
Revert "Deprecate notifyAppWidgetViewDataChanged"
This reverts commit e61404814947b611c68853050a4a22aeebe728bc. Reason for revert: Delay @Deprecated annotation (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:9bed3e0364c87c75f80d7f356ec89122a2396744) Merged-In: I6714a25a77e54eaac3f0953e58298385650bd55e Change-Id: I6714a25a77e54eaac3f0953e58298385650bd55e
-rw-r--r--core/api/current.txt4
-rw-r--r--core/java/android/appwidget/AppWidgetManager.java26
2 files changed, 4 insertions, 26 deletions
diff --git a/core/api/current.txt b/core/api/current.txt
index 1b5c953c21c6..690e023b225f 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -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);
diff --git a/core/java/android/appwidget/AppWidgetManager.java b/core/java/android/appwidget/AppWidgetManager.java
index 4cf9fcab9092..356ffd477780 100644
--- a/core/java/android/appwidget/AppWidgetManager.java
+++ b/core/java/android/appwidget/AppWidgetManager.java
@@ -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;