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

Commit 4557d194 authored by Vadim Caen's avatar Vadim Caen Committed by Automerger Merge Worker
Browse files

Merge "Hide branding view when empty" into sc-dev am: 015adecc 

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

Change-Id: I2d0b0ac079914e3593799ff83f4cc3366173a877
parents 8f227a27 015adecc

core/java/android/window/SplashScreenView.java

+3 −3
Original line number Diff line number Diff line
@@ -211,14 +211,14 @@ public final class SplashScreenView extends FrameLayout { 
                view.mParceledIconBitmap = mParceledIconBitmap;

            }

            // branding image

            if (mBrandingImageHeight > 0 && mBrandingImageWidth > 0) {

            if (mBrandingImageHeight > 0 && mBrandingImageWidth > 0 && mBrandingDrawable != null) {

                final ViewGroup.LayoutParams params = view.mBrandingImageView.getLayoutParams();

                params.width = mBrandingImageWidth;

                params.height = mBrandingImageHeight;

                view.mBrandingImageView.setLayoutParams(params);

            }

            if (mBrandingDrawable != null) {

                view.mBrandingImageView.setBackground(mBrandingDrawable);

            } else {

                view.mBrandingImageView.setVisibility(GONE);

            }

            if (mParceledBrandingBitmap != null) {

                view.mParceledBrandingBitmap = mParceledBrandingBitmap;

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

+1 −1
Original line number Diff line number Diff line
@@ -121,8 +121,8 @@ public class SplashscreenContentDrawer { 
        } else if (mTmpAttrs.mWindowBgResId != 0) {

            themeBGDrawable = context.getDrawable(mTmpAttrs.mWindowBgResId);

        } else {

            Slog.w(TAG, "Window background not exist!");

            themeBGDrawable = createDefaultBackgroundDrawable();

            Slog.w(TAG, "Window background does not exist, using " + themeBGDrawable);

        }

        final int estimatedWindowBGColor = estimateWindowBGColor(themeBGDrawable);

        Trace.traceEnd(TRACE_TAG_WINDOW_MANAGER);