summaryrefslogtreecommitdiffstats
path: root/policy/src
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2014-10-29 22:55:57 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-29 22:55:57 +0000
commitbaed009eaeaacffef7cc0972517434451e357aef (patch)
tree744e562cf8b0237e4e08782957536e6887dd9e44 /policy/src
parent9b5a4e9dafda3c9c5c62d3d7cf151f13c4126309 (diff)
parent2d3443fc5a6cf0830edd6a498a87760143dbc570 (diff)
downloadframeworks_base-baed009eaeaacffef7cc0972517434451e357aef.zip
frameworks_base-baed009eaeaacffef7cc0972517434451e357aef.tar.gz
frameworks_base-baed009eaeaacffef7cc0972517434451e357aef.tar.bz2
am 2d3443fc: Merge "Add setters for window elevation and clipToOutline properties" into lmp-mr1-dev
* commit '2d3443fc5a6cf0830edd6a498a87760143dbc570': Add setters for window elevation and clipToOutline properties
Diffstat (limited to 'policy/src')
-rw-r--r--policy/src/com/android/internal/policy/impl/PhoneWindow.java16
1 files changed, 16 insertions, 0 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindow.java b/policy/src/com/android/internal/policy/impl/PhoneWindow.java
index 1ed61fd..4714826 100644
--- a/policy/src/com/android/internal/policy/impl/PhoneWindow.java
+++ b/policy/src/com/android/internal/policy/impl/PhoneWindow.java
@@ -1332,6 +1332,22 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
}
@Override
+ public final void setElevation(float elevation) {
+ mElevation = elevation;
+ if (mDecor != null) {
+ mDecor.setElevation(elevation);
+ }
+ }
+
+ @Override
+ public final void setClipToOutline(boolean clipToOutline) {
+ mClipToOutline = clipToOutline;
+ if (mDecor != null) {
+ mDecor.setClipToOutline(clipToOutline);
+ }
+ }
+
+ @Override
public final void setBackgroundDrawable(Drawable drawable) {
if (drawable != mBackgroundDrawable || mBackgroundResource != 0) {
mBackgroundResource = 0;