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

Commit 526dba47 authored by Teng-Hui Zhu's avatar Teng-Hui Zhu Committed by android-build-merger
Browse files

Merge \"Mutate the drawable if a valid state change happen\" into nyc-dev 

am: 486c76b5

Change-Id: I9f09c87cd4f738066c55d28fa7849fafdc33b7f9
parents 1b7dbd92 486c76b5

graphics/java/android/graphics/drawable/VectorDrawable.java

+6 −3
Original line number Diff line number Diff line
@@ -240,9 +240,7 @@ public class VectorDrawable extends Drawable { 
     * constructors to set the state and initialize local properties.

     */

    private VectorDrawable(@NonNull VectorDrawableState state, @Nullable Resources res) {

        // Constant state sharing is disabled until we fix onStateChanged()

        // affecting the shared bitmap.

        mVectorState = new VectorDrawableState(state);

        mVectorState = state;

        updateLocalState(res);

    }
@@ -388,6 +386,11 @@ public class VectorDrawable extends Drawable { 
    protected boolean onStateChange(int[] stateSet) {

        boolean changed = false;



        // When the VD is stateful, we need to mutate the drawable such that we don't share the

        // cache bitmap with others. Such that the state change only affect this new cached bitmap.

        if (isStateful()) {

            mutate();

        }

        final VectorDrawableState state = mVectorState;

        if (state.onStateChange(stateSet)) {

            changed = true;