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

Merge "Check for null bg insets during initialization" into qt-dev

Browse Source
This commit is contained in:
Jorim Jaggi
2019-05-09 16:20:28 +00:00
committed by Android (Google) Code Review
parent 1a054122f0 d798fd3f99
commit 44787038c2
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
core/java/com/android/internal/policy/DecorView.java
View File

@@ -1230,6 +1230,10 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind
* are set.
*/
private void updateBackgroundDrawable() {
// Background insets can be null if super constructor calls setBackgroundDrawable.
if (mBackgroundInsets == null) {
mBackgroundInsets = Insets.NONE;
}
if (mBackgroundInsets.equals(mLastBackgroundInsets)
&& mLastOriginalBackgroundDrawable == mOriginalBackgroundDrawable) {
return;
@@ -1553,10 +1557,14 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind
return;
}
setPadding(mFramePadding.left + mBackgroundPadding.left,
mFramePadding.top + mBackgroundPadding.top,
mFramePadding.right + mBackgroundPadding.right,
mFramePadding.bottom + mBackgroundPadding.bottom);
// Fields can be null if super constructor calls setBackgroundDrawable.
Rect framePadding = mFramePadding != null ? mFramePadding : new Rect();
Rect backgroundPadding = mBackgroundPadding != null ? mBackgroundPadding : new Rect();
setPadding(framePadding.left + backgroundPadding.left,
framePadding.top + backgroundPadding.top,
framePadding.right + backgroundPadding.right,
framePadding.bottom + backgroundPadding.bottom);
requestLayout();
invalidate();
@@ -1576,8 +1584,8 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind
if (bg != null) {
if (fg == null) {
opacity = bg.getOpacity();
} else if (mFramePadding.left <= 0 && mFramePadding.top <= 0
&& mFramePadding.right <= 0 && mFramePadding.bottom <= 0) {
} else if (framePadding.left <= 0 && framePadding.top <= 0
&& framePadding.right <= 0 && framePadding.bottom <= 0) {
// If the frame padding is zero, then we can be opaque
// if either the frame -or- the background is opaque.
int fop = fg.getOpacity();