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

Commit 477f3d09 authored by Alan Viverette's avatar Alan Viverette
Browse files

Obtain cached drawables using the correct Resources object 

Previously we were discarding the Resources when forwarding from the
two-arg factory method to the one-arg method. This CL also updates the
documentation for ConstantState to be slightly more comprehensive.

Bug: 25688078
Change-Id: I4fbbf43f95fe792fa6f0bf9db8fd9a7cbfa51d1d
parent 746955c0

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

+38 −14
Original line number Diff line number Diff line
@@ -1240,30 +1240,54 @@ public abstract class Drawable { 
     */

    public static abstract class ConstantState {

        /**

         * Create a new drawable without supplying resources the caller

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

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

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

         * instead to provide a resource.

         * Creates a new Drawable instance from its constant state.

         * <p>

         * <strong>Note:</strong> Using this method means density-dependent

         * properties, such as pixel dimensions or bitmap images, will not be

         * updated to match the density of the target display. To ensure

         * correct scaling, use {@link #newDrawable(Resources)} instead to

         * provide an appropriate Resources object.

         *

         * @return a new drawable object based on this constant state

         * @see {@link #newDrawable(Resources)}

         */

        @NonNull

        public abstract Drawable newDrawable();



        /**

         * Create a new Drawable instance from its constant state.  This

         * must be implemented for drawables that change based on the target

         * density of their caller (that is depending on whether it is

         * in compatibility mode).

         * Creates a new Drawable instance from its constant state using the

         * specified resources. This method should be implemented for drawables

         * that have density-dependent properties.

         * <p>

         * The default implementation for this method calls through to

         * {@link #newDrawable()}.

         *

         * @param res the resources of the context in which the drawable will

         *            be displayed

         * @return a new drawable object based on this constant state

         */

        public Drawable newDrawable(Resources res) {

        @NonNull

        public Drawable newDrawable(@Nullable Resources res) {

            return newDrawable();

        }



        /**

         * Create a new Drawable instance from its constant state. This must be

         * implemented for drawables that can have a theme applied.

         */

        public Drawable newDrawable(Resources res, Theme theme) {

            return newDrawable(null);

         * Creates a new Drawable instance from its constant state using the

         * specified resources and theme. This method should be implemented for

         * drawables that have theme-dependent properties.

         * <p>

         * The default implementation for this method calls through to

         * {@link #newDrawable(Resources)}.

         *

         * @param res the resources of the context in which the drawable will

         *            be displayed

         * @param theme the theme of the context in which the drawable will be

         *              displayed

         * @return a new drawable object based on this constant state

         */

        @NonNull

        public Drawable newDrawable(@Nullable Resources res, @Nullable Theme theme) {

            return newDrawable(res);

        }



        /**