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

am 50baf1fd: Merge "Remove clipToOutline workaround for null backgrounds" into lmp-dev

Browse Source 
* commit '50baf1fd9d651db643204b0871231160b8be96d9':
  Remove clipToOutline workaround for null backgrounds
This commit is contained in:
Alan Viverette
2014-08-07 20:51:46 +00:00
committed by Android Git Automerger
parent 77ef7abc5c e46a9b97fb
commit 1081fa6a20
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
policy/src/com/android/internal/policy/impl/PhoneWindow.java
View File

@@ -1314,7 +1314,6 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
mBackgroundDrawable = drawable;
if (mDecor != null) {
mDecor.setWindowBackground(drawable);
mDecor.setClipToOutline(drawable != null && mClipToOutline);
}
}
}
@@ -3389,10 +3388,6 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
}
mDecor.setWindowBackground(background);
if (background != null) {
mDecor.setClipToOutline(mClipToOutline);
}
final Drawable frame;
if (mFrameResource != 0) {
frame = getContext().getDrawable(mFrameResource);
@@ -3402,6 +3397,7 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
mDecor.setWindowFrame(frame);
mDecor.setElevation(mElevation);
mDecor.setClipToOutline(mClipToOutline);
if (mTitle != null) {
setTitle(mTitle);