Merge "Merge "Revert "Pretend to be having the original background"" into... (baca2b99) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/policy/DecorView.java

+1 −6

Original line number	Original line	Diff line number	Diff line
	@@ -630,7 +630,7 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind
	drawingBounds.bottom -= framePadding.bottom - frameOffsets.bottom;		drawingBounds.bottom -= framePadding.bottom - frameOffsets.bottom;
	}		}

	Drawable bg = super.getBackground();		Drawable bg = getBackground();
	if (bg != null) {		if (bg != null) {
	bg.setBounds(drawingBounds);		bg.setBounds(drawingBounds);
	}		}
	@@ -1238,11 +1238,6 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind
	mLastOriginalBackgroundDrawable = mOriginalBackgroundDrawable;		mLastOriginalBackgroundDrawable = mOriginalBackgroundDrawable;
	}		}

	@Override
	public Drawable getBackground() {
	return mOriginalBackgroundDrawable;
	}

	private int calculateStatusBarColor() {		private int calculateStatusBarColor() {
	return calculateBarColor(mWindow.getAttributes().flags, FLAG_TRANSLUCENT_STATUS,		return calculateBarColor(mWindow.getAttributes().flags, FLAG_TRANSLUCENT_STATUS,
	mSemiTransparentBarColor, mWindow.mStatusBarColor,		mSemiTransparentBarColor, mWindow.mStatusBarColor,