Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 685a8770: Merge "Fix inset check in ThreadedRenderer" into lmp-mr1-dev

Browse Source 
* commit '685a8770c018d02080d29f18fcb9e50a182912aa':
  Fix inset check in ThreadedRenderer
This commit is contained in:
Alan Viverette
2014-10-30 22:34:44 +00:00
committed by Android Git Automerger
parent 3bfd2b7b8f 685a8770c0
commit e1f9f23110
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/view/ThreadedRenderer.java
View File

@@ -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;

2
core/java/android/view/WindowManager.java
View File

@@ -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