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

Commit 7ffa6a03 authored by Gilles Debunne's avatar Gilles Debunne Committed by Android (Google) Code Review
Browse files

Merge "Fixed links in MipmapDrawable documentation."

parents bc3f5389 20fc9bfe

graphics/java/android/graphics/drawable/Drawable.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -837,7 +837,8 @@ public abstract class Drawable { 
         * Create a new drawable without supplying resources the caller

         * Create a new drawable without supplying resources the caller

         * is running in.  Note that using this means the density-dependent

         * is running in.  Note that using this means the density-dependent

         * drawables (like bitmaps) will not be able to update their target

         * drawables (like bitmaps) will not be able to update their target

         * density correctly.

         * density correctly. One should use {@link #newDrawable(Resources)}

         * instead to provide a resource.

         */

         */

        public abstract Drawable newDrawable();

        public abstract Drawable newDrawable();

        /**

        /**

graphics/java/android/graphics/drawable/MipmapDrawable.java

+4 −4
Original line number Original line Diff line number Diff line
@@ -56,8 +56,8 @@ import java.io.IOException; 
 *

 *

 * <p>

 * <p>

 * The intrinsic size of a MipmapDrawable are inferred from those of the largest mipmap (in terms of

 * The intrinsic size of a MipmapDrawable are inferred from those of the largest mipmap (in terms of

 * {@link #Drawable.getIntrinsicHeight()}). On the opposite, its minimum size is defined by the

 * {@link Drawable#getIntrinsicHeight()}). On the opposite, its minimum

 * smallest provided mipmap.

 * size is defined by the smallest provided mipmap.

 * </p>

 * </p>





 * It can be defined in an XML file with the <code>&lt;mipmap></code> element.

 * It can be defined in an XML file with the <code>&lt;mipmap></code> element.
@@ -229,8 +229,8 @@ public class MipmapDrawable extends DrawableContainer { 




        /**

        /**

         * Adds a Drawable to the list of available mipmap Drawables. This list can be retrieved

         * Adds a Drawable to the list of available mipmap Drawables. This list can be retrieved

         * using {@link #DrawableContainer.getChildren()} and this method ensures that it is

         * using {@link DrawableContainer.DrawableContainerState#getChildren()} and this method

         * always sorted by increasing Drawable {@link #Drawable.getIntrinsicHeight()}.

         * ensures that it is always sorted by increasing {@link Drawable#getIntrinsicHeight()}.

         *

         *

         * @param drawable The Drawable that will be added to children list

         * @param drawable The Drawable that will be added to children list

         */

         */