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

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

Browse Source 
* commit 'e1f9f2311035177a91dd568c7ec9a821a76b9e24':
  Fix inset check in ThreadedRenderer
This commit is contained in:
Alan Viverette
2014-10-31 00:38:39 +00:00
committed by Android Git Automerger
parent 6a80527f61 e1f9f23110
commit 1dfcd0cc96
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; final float lightX = width / 2.0f;
mWidth = width; mWidth = width;
mHeight = height; mHeight = height;
if (surfaceInsets != null && !surfaceInsets.isEmpty()) { if (surfaceInsets != null && (surfaceInsets.left != 0 || surfaceInsets.right != 0
|| surfaceInsets.top != 0 || surfaceInsets.bottom != 0)) {
mHasInsets = true; mHasInsets = true;
mInsetLeft = surfaceInsets.left; mInsetLeft = surfaceInsets.left;
mInsetTop = surfaceInsets.top; mInsetTop = surfaceInsets.top;

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

@@ -1324,7 +1324,7 @@ public interface WindowManager extends ViewManager {
* *
* @hide * @hide
*/ */
public Rect surfaceInsets = new Rect(); public final Rect surfaceInsets = new Rect();
/** /**
* The desired bitmap format. May be one of the constants in * The desired bitmap format. May be one of the constants in