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

Commit f45c3bc5 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['googleplex-android-review.googlesource.com/25867558',... 

Merge cherrypicks of ['googleplex-android-review.googlesource.com/25867558', 'googleplex-android-review.googlesource.com/26119187'] into 24Q1-release.

Change-Id: I7a37e8ade7423184af4ba3bc7aadbe414353d6dd
parents c88338e5 6ee34965

core/api/current.txt

+3 −3
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);
@@ -59609,7 +59609,7 @@ package android.widget { 
    method public void setRadioGroupChecked(@IdRes int, @IdRes int);

    method public void setRelativeScrollPosition(@IdRes int, int);

    method @Deprecated public void setRemoteAdapter(int, @IdRes int, android.content.Intent);

    method @Deprecated public void setRemoteAdapter(@IdRes int, android.content.Intent);

    method public void setRemoteAdapter(@IdRes int, android.content.Intent);

    method public void setRemoteAdapter(@IdRes int, @NonNull android.widget.RemoteViews.RemoteCollectionItems);

    method public void setScrollPosition(@IdRes int, int);

    method public void setShort(@IdRes int, String, short);

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;

core/java/android/widget/RemoteViews.java

+0 −3
Original line number Diff line number Diff line
@@ -4944,10 +4944,7 @@ public class RemoteViews implements Parcelable, Filter { 
     * @param viewId The id of the {@link AdapterView}

     * @param intent The intent of the service which will be

     *            providing data to the RemoteViewsAdapter

     * @deprecated use

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

     */

    @Deprecated

    public void setRemoteAdapter(@IdRes int viewId, Intent intent) {

        if (remoteAdapterConversion()) {

            addAction(new SetRemoteCollectionItemListAdapterAction(viewId, intent));