diff options
| author | Alan Viverette <alanv@google.com> | 2014-10-30 22:30:20 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-30 22:30:21 +0000 |
| commit | 685a8770c018d02080d29f18fcb9e50a182912aa (patch) | |
| tree | a257351a0b4e035793c3975bad7490b1953b0e63 | |
| parent | 159da3dba8811017c683fcee26c795be1948b0c4 (diff) | |
| parent | 3aa1ffbc75e39b8e53b64256775ea917ca0c6bee (diff) | |
| download | frameworks_base-685a8770c018d02080d29f18fcb9e50a182912aa.zip frameworks_base-685a8770c018d02080d29f18fcb9e50a182912aa.tar.gz frameworks_base-685a8770c018d02080d29f18fcb9e50a182912aa.tar.bz2 | |
Merge "Fix inset check in ThreadedRenderer" into lmp-mr1-dev
| -rw-r--r-- | core/java/android/view/ThreadedRenderer.java | 3 | ||||
| -rw-r--r-- | core/java/android/view/WindowManager.java | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/core/java/android/view/ThreadedRenderer.java b/core/java/android/view/ThreadedRenderer.java index 0711aed..00a8884 100644 --- a/core/java/android/view/ThreadedRenderer.java +++ b/core/java/android/view/ThreadedRenderer.java @@ -191,7 +191,8 @@ public class ThreadedRenderer extends HardwareRenderer { final float lightX = width / 2.0f; mWidth = width; mHeight = height; - if (surfaceInsets != null && !surfaceInsets.isEmpty()) { + if (surfaceInsets != null && (surfaceInsets.left != 0 || surfaceInsets.right != 0 + || surfaceInsets.top != 0 || surfaceInsets.bottom != 0)) { mHasInsets = true; mInsetLeft = surfaceInsets.left; mInsetTop = surfaceInsets.top; diff --git a/core/java/android/view/WindowManager.java b/core/java/android/view/WindowManager.java index 5b48c0d..f4f047e 100644 --- a/core/java/android/view/WindowManager.java +++ b/core/java/android/view/WindowManager.java @@ -1324,7 +1324,7 @@ public interface WindowManager extends ViewManager { * * @hide */ - public Rect surfaceInsets = new Rect(); + public final Rect surfaceInsets = new Rect(); /** * The desired bitmap format. May be one of the constants in |