From: Jorim Jaggi <jjaggi@google.com>
Date: Fri, 12 Apr 2019 14:19:51 +0000 (+0000)
Subject: Merge "Pretend to be having the original background" into qt-dev
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=757cbfead31357440884af8224f32eb399e7044e;p=android-x86%2Fframeworks-base.git

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

757cbfead31357440884af8224f32eb399e7044e
diff --cc core/java/com/android/internal/policy/DecorView.java
index d945e139dd0f,ad603b4267ed..32fce8f78330
--- a/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() {