diff options
| -rw-r--r-- | core/java/android/window/SplashScreenView.java | 6 | ||||
| -rw-r--r-- | libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/SplashscreenContentDrawer.java | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/core/java/android/window/SplashScreenView.java b/core/java/android/window/SplashScreenView.java index da445b8b9f33..9998bccec9c9 100644 --- a/core/java/android/window/SplashScreenView.java +++ b/core/java/android/window/SplashScreenView.java @@ -200,14 +200,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; diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/SplashscreenContentDrawer.java b/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/SplashscreenContentDrawer.java index 3f9c2717731a..3e71318c8851 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/SplashscreenContentDrawer.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/SplashscreenContentDrawer.java @@ -129,8 +129,8 @@ public class SplashscreenContentDrawer { } else if (attrs.mWindowBgResId != 0) { themeBGDrawable = context.getDrawable(attrs.mWindowBgResId); } else { - Slog.w(TAG, "Window background not exist!"); themeBGDrawable = createDefaultBackgroundDrawable(); + Slog.w(TAG, "Window background does not exist, using " + themeBGDrawable); } final int animationDuration; final Drawable iconDrawable; |