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

Commit 91c1c876 authored by Sihua Ma's avatar Sihua Ma Committed by Android (Google) Code Review
Browse files

Merge "Deprecate setRemoteAdapter that takes service intent" into main

parents e83dbf6b 68e6da6e

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -60157,7 +60157,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 public void setRemoteAdapter(@IdRes int, android.content.Intent);

    method @Deprecated 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/widget/RemoteViews.java

+3 −0
Original line number Diff line number Diff line
@@ -5127,7 +5127,10 @@ 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));