diff options
Diffstat (limited to 'core/java/android/window/SplashScreenView.java')
| -rw-r--r-- | core/java/android/window/SplashScreenView.java | 6 |
1 files changed, 3 insertions, 3 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; |
