summaryrefslogtreecommitdiffstats
path: root/policy
diff options
context:
space:
mode:
authorCraig Mautner <cmautner@google.com>2012-05-17 13:11:50 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-05-17 13:11:50 -0700
commitd51a68b3d2d347be989b53af1777454f97ad9b46 (patch)
tree9ed23d0c9d20766a187d3c0ad50e0e03627f6f00 /policy
parent9cb376e792567b5278e0eb418a3aeb848339a283 (diff)
parentbf08af3323117e15a65b74e66b7499d31537f9e1 (diff)
downloadframeworks_base-d51a68b3d2d347be989b53af1777454f97ad9b46.zip
frameworks_base-d51a68b3d2d347be989b53af1777454f97ad9b46.tar.gz
frameworks_base-d51a68b3d2d347be989b53af1777454f97ad9b46.tar.bz2
Merge "Eliminate deferred surface destruction." into jb-dev
Diffstat (limited to 'policy')
-rw-r--r--policy/src/com/android/internal/policy/impl/KeyguardViewManager.java1
1 files changed, 0 insertions, 1 deletions
diff --git a/policy/src/com/android/internal/policy/impl/KeyguardViewManager.java b/policy/src/com/android/internal/policy/impl/KeyguardViewManager.java
index 7f432bf..504bb63 100644
--- a/policy/src/com/android/internal/policy/impl/KeyguardViewManager.java
+++ b/policy/src/com/android/internal/policy/impl/KeyguardViewManager.java
@@ -117,7 +117,6 @@ public class KeyguardViewManager implements KeyguardWindowController {
final int stretch = ViewGroup.LayoutParams.MATCH_PARENT;
int flags = WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN
| WindowManager.LayoutParams.FLAG_SHOW_WALLPAPER
- | WindowManager.LayoutParams.FLAG_KEEP_SURFACE_WHILE_ANIMATING
| WindowManager.LayoutParams.FLAG_SLIPPERY
/*| WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN
| WindowManager.LayoutParams.FLAG_LAYOUT_INSET_DECOR*/ ;