Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Hide branding view when empty

Browse Source 
It looks like the empty branding view was causing the underlying
view to bleed through it so ensuring that it is removed if empty.

Bug: 182708883
Change-Id: I868931768bed5b083433fd5222720724bfe3e60e
This commit is contained in:
Vadim Caen
2021-03-17 19:45:23 +01:00
parent 689a571110
commit 884c99d065
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/window/SplashScreenView.java
View File

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

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

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