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

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

Merge "Making AdapaterViewAnimator setDisplayedChild remotable"

parents 8199efbb 0b96a57c

api/current.xml

+16 −1
Original line number Diff line number Diff line
@@ -257571,6 +257571,21 @@ 
<parameter name="started" type="boolean">

</parameter>

</method>

<method name="setDisplayedChild"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="viewId" type="int">

</parameter>

<parameter name="childIndex" type="int">

</parameter>

</method>

<method name="setDouble"

 return="void"

 abstract="false"
@@ -265605,7 +265620,7 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<parameter name="arg0" type="T">

<parameter name="t" type="T">

</parameter>

</method>

</interface>

core/java/android/widget/AdapterViewAnimator.java

+1 −0
Original line number Diff line number Diff line
@@ -279,6 +279,7 @@ public abstract class AdapterViewAnimator extends AdapterView<Adapter> 
     *

     * @param whichChild the index of the child view to display

     */

    @android.view.RemotableViewMethod

    public void setDisplayedChild(int whichChild) {

        setDisplayedChild(whichChild, true);

    }

core/java/android/widget/RemoteViews.java

+14 −4
Original line number Diff line number Diff line
@@ -1056,23 +1056,33 @@ public class RemoteViews implements Parcelable, Filter { 
    }



    /**

     * Equivalent to calling {@link AdapterViewFlipper#showNext()}

     * Equivalent to calling {@link AdapterViewAnimator#showNext()}

     *

     * @param viewId The id of the view on which to call {@link AdapterViewFlipper#showNext()}

     * @param viewId The id of the view on which to call {@link AdapterViewAnimator#showNext()}

     */

    public void showNext(int viewId) {

        addAction(new ReflectionActionWithoutParams(viewId, "showNext"));

    }



    /**

     * Equivalent to calling {@link AdapterViewFlipper#showPrevious()}

     * Equivalent to calling {@link AdapterViewAnimator#showPrevious()}

     *

     * @param viewId The id of the view on which to call {@link AdapterViewFlipper#showPrevious()}

     * @param viewId The id of the view on which to call {@link AdapterViewAnimator#showPrevious()}

     */

    public void showPrevious(int viewId) {

        addAction(new ReflectionActionWithoutParams(viewId, "showPrevious"));

    }



    /**

     * Equivalent to calling {@link AdapterViewAnimator#setDisplayedChild(int)}

     *

     * @param viewId The id of the view on which to call

     *               {@link AdapterViewAnimator#setDisplayedChild(int)}

     */

    public void setDisplayedChild(int viewId, int childIndex) {

        setInt(viewId, "setDisplayedChild", childIndex);

    }



    /**

     * Equivalent to calling View.setVisibility

     *

core/java/android/widget/ViewAnimator.java

+3 −0
Original line number Diff line number Diff line
@@ -96,6 +96,7 @@ public class ViewAnimator extends FrameLayout { 
     *

     * @param whichChild the index of the child view to display

     */

    @android.view.RemotableViewMethod

    public void setDisplayedChild(int whichChild) {

        mWhichChild = whichChild;

        if (whichChild >= getChildCount()) {
@@ -122,6 +123,7 @@ public class ViewAnimator extends FrameLayout { 
    /**

     * Manually shows the next child.

     */

    @android.view.RemotableViewMethod

    public void showNext() {

        setDisplayedChild(mWhichChild + 1);

    }
@@ -129,6 +131,7 @@ public class ViewAnimator extends FrameLayout { 
    /**

     * Manually shows the previous child.

     */

    @android.view.RemotableViewMethod

    public void showPrevious() {

        setDisplayedChild(mWhichChild - 1);

    }