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

Commit d4353e8b authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by Automerger Merge Worker
Browse files

Merge "Fixes a wrong cast position." into udc-dev am: f9142698 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21555928



Change-Id: I839c8852eccf3695134854a591c1fadcc313abbe
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d5ebca38 f9142698

libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/SplashscreenContentDrawer.java

+5 −5
Original line number Diff line number Diff line
@@ -384,10 +384,10 @@ public class SplashscreenContentDrawer { 


    private static int estimateWindowBGColor(Drawable themeBGDrawable) {

        final DrawableColorTester themeBGTester = new DrawableColorTester(

                themeBGDrawable, DrawableColorTester.TRANSPARENT_FILTER /* filterType */);

        if (themeBGTester.passFilterRatio() == 0) {

            // the window background is transparent, unable to draw

            Slog.w(TAG, "Window background is transparent, fill background with black color");

                themeBGDrawable, DrawableColorTester.TRANSLUCENT_FILTER /* filterType */);

        if (themeBGTester.passFilterRatio() != 1) {

            // the window background is translucent, unable to draw

            Slog.w(TAG, "Window background is translucent, fill background with black color");

            return getSystemBGColor();

        } else {

            return themeBGTester.getDominateColor();
@@ -870,7 +870,7 @@ public class SplashscreenContentDrawer { 
            @Override

            public float passFilterRatio() {

                final int alpha = mColorDrawable.getAlpha();

                return (float) (alpha / 255);

                return alpha / 255.0f;

            }



            @Override