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

Commit 4d1e80f8 authored by Scott Main's avatar Scott Main Committed by Android (Google) Code Review
Browse files

Merge "cherrypick Change-Id: Iaada8d42f97786d393743cd7fc3011da1d21f22e docs:... 

Merge "cherrypick Change-Id: Iaada8d42f97786d393743cd7fc3011da1d21f22e docs: resolve issue 5044273 and fix markup error"
parents 3fcc06e8 34235c6e

docs/html/guide/topics/resources/animation-resource.jd

+2 −2
Original line number Diff line number Diff line
@@ -10,8 +10,8 @@ parent.link=available-resources.html 
      <li><a href="#Property">Property Animation</a></li>

      <li><a href="#View">View Animation</a>

        <ol>

          <li><a href="Tween">Tween animation</li>

          <li><a href="Frame">Frame animation</li>

          <li><a href="Tween">Tween animation</a></li>

          <li><a href="Frame">Frame animation</a></li>

        </ol>      

      </li>

    </ol>

graphics/java/android/graphics/drawable/AnimationDrawable.java

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ import android.util.AttributeSet; 
 * <p>

 * The simplest way to create a frame-by-frame animation is to define the animation in an XML

 * file, placed in the res/drawable/ folder, and set it as the background to a View object. Then, call

 * {@link #run()} to start the animation.

 * {@link #start()} to run the animation.

 * <p>

 * An AnimationDrawable defined in XML consists of a single <code>&lt;animation-list></code> element,

 * and a series of nested <code>&lt;item></code> tags. Each item defines a frame of the animation.