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

Commit be8bc839 authored by Adam Cohen's avatar Adam Cohen Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE Stripping some new widget API that is yet unused" into jb-mr2-dev

parents b1e5137a 33f3aab2

api/current.txt

+0 −1
Original line number Original line Diff line number Diff line
@@ -30044,7 +30044,6 @@ package android.widget { 
    method public void setRelativeScrollPosition(int, int);

    method public void setRelativeScrollPosition(int, int);

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

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

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

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

    method public void setRemoteAdapter(int, java.util.ArrayList<android.widget.RemoteViews>, int);

    method public void setScrollPosition(int, int);

    method public void setScrollPosition(int, int);

    method public void setShort(int, java.lang.String, short);

    method public void setShort(int, java.lang.String, short);

    method public void setString(int, java.lang.String, java.lang.String);

    method public void setString(int, java.lang.String, java.lang.String);

core/java/android/widget/RemoteViews.java

+2 −0
Original line number Original line Diff line number Diff line
@@ -2108,6 +2108,8 @@ public class RemoteViews implements Parcelable, Filter { 
     *      RemoteViews. This count cannot change during the life-cycle of a given widget, so this

     *      RemoteViews. This count cannot change during the life-cycle of a given widget, so this

     *      parameter should account for the maximum possible number of types that may appear in the

     *      parameter should account for the maximum possible number of types that may appear in the

     *      See {@link Adapter#getViewTypeCount()}.

     *      See {@link Adapter#getViewTypeCount()}.

     *

     * @hide

     */

     */

    public void setRemoteAdapter(int viewId, ArrayList<RemoteViews> list, int viewTypeCount) {

    public void setRemoteAdapter(int viewId, ArrayList<RemoteViews> list, int viewTypeCount) {

        addAction(new SetRemoteViewsAdapterList(viewId, list, viewTypeCount));

        addAction(new SetRemoteViewsAdapterList(viewId, list, viewTypeCount));