commit 2c18333577059663b1d89a86752f382b052ca3f8
author Alan Viverette <alanv@google.com> Thu Aug 07 13:43:05 2014 -0700
committer Alan Viverette <alanv@google.com> Thu Aug 07 13:43:05 2014 -0700
tree 1d963f44ba748502ca784669a20065a7a60dd5a4
parent bcc48b6cb09fda744b64d15b02f6e5c5fcfc9b7d

Remove clipToOutline workaround for null backgrounds

BUG: 16566746
Change-Id: Icdf0d40b75c0fa9d972eb6300f51079e48fbe5fd

policy/src/com/android/internal/policy/impl/PhoneWindow.java

diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindow.java b/policy/src/com/android/internal/policy/impl/PhoneWindow.java
index ff3cd9d..964acbd 100644
--- a/policy/src/com/android/internal/policy/impl/PhoneWindow.java
+++ b/policy/src/com/android/internal/policy/impl/PhoneWindow.java
@@ -1314,7 +1314,6 @@
             mBackgroundDrawable = drawable;
             if (mDecor != null) {
                 mDecor.setWindowBackground(drawable);
-                mDecor.setClipToOutline(drawable != null && mClipToOutline);
             }
         }
     }
@@ -3389,10 +3388,6 @@
             }
             mDecor.setWindowBackground(background);
 
-            if (background != null) {
-                mDecor.setClipToOutline(mClipToOutline);
-            }
-
             final Drawable frame;
             if (mFrameResource != 0) {
                 frame = getContext().getDrawable(mFrameResource);
@@ -3402,6 +3397,7 @@
             mDecor.setWindowFrame(frame);
 
             mDecor.setElevation(mElevation);
+            mDecor.setClipToOutline(mClipToOutline);
 
             if (mTitle != null) {
                 setTitle(mTitle);