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

Commit 35d44ba4 authored by Tenghui Zhu's avatar Tenghui Zhu Committed by Android (Google) Code Review
Browse files

Merge "Update the VD and AVD's getOpacity()" into nyc-dev

parents fa4f3f2f f10d08a3

graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java

+2 −1
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ import android.graphics.Canvas; 
import android.graphics.ColorFilter;

import android.graphics.Insets;

import android.graphics.Outline;

import android.graphics.PixelFormat;

import android.graphics.PorterDuff;

import android.graphics.Rect;

import android.os.Build;
@@ -307,7 +308,7 @@ public class AnimatedVectorDrawable extends Drawable implements Animatable2 { 


    @Override

    public int getOpacity() {

        return mAnimatedVectorState.mVectorDrawable.getOpacity();

        return PixelFormat.TRANSLUCENT;

    }



    @Override

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

+3 −1
Original line number Diff line number Diff line
@@ -364,7 +364,9 @@ public class VectorDrawable extends Drawable { 


    @Override

    public int getOpacity() {

        return PixelFormat.TRANSLUCENT;

        // We can't tell whether the drawable is fully opaque unless we examine all the pixels,

        // but we could tell it is transparent if the root alpha is 0.

        return getAlpha() == 0 ? PixelFormat.TRANSPARENT : PixelFormat.TRANSLUCENT;

    }



    @Override