Merge "Pretend to be having the original background" into qt-dev

diff --cc core/java/com/android/internal/policy/DecorView.java
index d945e13,ad603b4..32fce8f
--- 1/core/java/com/android/internal/policy/DecorView.java
--- 2/core/java/com/android/internal/policy/DecorView.java
+++ b/core/java/com/android/internal/policy/DecorView.java
@@@ -1238,11 -1235,14 +1238,16 @@@ public class DecorView extends FrameLay
          mLastOriginalBackgroundDrawable = mOriginalBackgroundDrawable;
      }
  
+     @Override
+     public Drawable getBackground() {
+         return mOriginalBackgroundDrawable;
+     }
+ 
      private int calculateStatusBarColor() {
          return calculateBarColor(mWindow.getAttributes().flags, FLAG_TRANSLUCENT_STATUS,
 -                mSemiTransparentBarColor, mWindow.mStatusBarColor);
 +                mSemiTransparentBarColor, mWindow.mStatusBarColor,
 +                getWindowSystemUiVisibility(), SYSTEM_UI_FLAG_LIGHT_STATUS_BAR,
 +                mWindow.mEnsureStatusBarContrastWhenTransparent);
      }
  
      private int calculateNavigationBarColor() {