diff options
| author | Craig Mautner <cmautner@google.com> | 2012-05-17 13:13:56 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-05-17 13:13:56 -0700 |
| commit | a978d9bfefa8f7cb1591a1789effa955d902a9cf (patch) | |
| tree | 669fd0c85608d0cc4f0db214a9128a721b58c53c /policy | |
| parent | 0ddb5d3b5d91ed0b891476e834de5ec4ffafece8 (diff) | |
| parent | d51a68b3d2d347be989b53af1777454f97ad9b46 (diff) | |
| download | frameworks_base-a978d9bfefa8f7cb1591a1789effa955d902a9cf.zip frameworks_base-a978d9bfefa8f7cb1591a1789effa955d902a9cf.tar.gz frameworks_base-a978d9bfefa8f7cb1591a1789effa955d902a9cf.tar.bz2 | |
am d51a68b3: Merge "Eliminate deferred surface destruction." into jb-dev
* commit 'd51a68b3d2d347be989b53af1777454f97ad9b46':
Eliminate deferred surface destruction.
Diffstat (limited to 'policy')
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/KeyguardViewManager.java | 1 |
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*/ ; |