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

Commit 015adecc authored Mar 23, 2021 by Vadim Caen Committed by Android (Google) Code Review Mar 23, 2021

Merge "Hide branding view when empty" into sc-dev

parents 1e34ea39 884c99d0

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);