Merge "Revert "Deprecate notifyAppWidgetViewDataChanged"" into main (adc76590) · Commits · e / os / android_frameworks_base

core/api/current.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -9514,8 +9514,8 @@ package android.appwidget {
		method public static android.appwidget.AppWidgetManager getInstance(android.content.Context);
		method @FlaggedApi("android.appwidget.flags.generated_previews") @Nullable public android.widget.RemoteViews getWidgetPreview(@NonNull android.content.ComponentName, @Nullable android.os.UserHandle, int);
		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 @FlaggedApi("android.appwidget.flags.generated_previews") public void removeWidgetPreview(@NonNull android.content.ComponentName, int);

core/java/android/appwidget/AppWidgetManager.java

+2 −24

Original line number	Diff line number	Diff line
		@@ -822,18 +822,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;
		@@ -884,18 +873,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;