summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Chris Craik <ccraik@google.com> 2014-08-28 20:49:05 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2014-08-28 20:49:06 +0000
commit12b500959dba868202d703be71df620ea0814ccb (patch)
treee0b04460a0e35e86d08deb6ff6c4858e20e744fa
parent1a3febe711cf24d06c26a6f17d04d61a561d94eb (diff)
parent868d74536e60914acb4f63d11e2d32417b78382e (diff)
Merge "Force translucency for inset windows" into lmp-dev
-rw-r--r--services/core/java/com/android/server/wm/WindowStateAnimator.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/WindowStateAnimator.java b/services/core/java/com/android/server/wm/WindowStateAnimator.java
index 38433ae9233b..4b7dd088f40e 100644
--- a/services/core/java/com/android/server/wm/WindowStateAnimator.java
+++ b/services/core/java/com/android/server/wm/WindowStateAnimator.java
@@ -754,7 +754,11 @@ class WindowStateAnimator {
final boolean isHwAccelerated = (attrs.flags &
WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED) != 0;
final int format = isHwAccelerated ? PixelFormat.TRANSLUCENT : attrs.format;
- if (!PixelFormat.formatHasAlpha(attrs.format)) {
+ if (!PixelFormat.formatHasAlpha(attrs.format)
+ && attrs.surfaceInsets.left == 0
+ && attrs.surfaceInsets.top == 0
+ && attrs.surfaceInsets.right == 0
+ && attrs.surfaceInsets.bottom == 0) {
flags |= SurfaceControl.OPAQUE;
}