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

Fix wrong measurement in DecorView

Browse Source 
am: ffd049027f

* commit 'ffd049027f1cb85c67353abefcf130c1474c261a':
  Fix wrong measurement in DecorView
This commit is contained in:
Jorim Jaggi
2016-02-24 00:40:25 +00:00
committed by android-build-merger
parent 1300e14d79 ffd049027f
commit c907ce46db
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/com/android/internal/policy/DecorView.java
View File

@@ -585,14 +585,14 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind
w = 0; w = 0;
} }
if (DEBUG_MEASURE) Log.d(mLogTag, "Fixed width: " + w); if (DEBUG_MEASURE) Log.d(mLogTag, "Fixed width: " + w);
final int widthSize = MeasureSpec.getSize(widthMeasureSpec);
if (w > 0) { if (w > 0) {
final int widthSize = MeasureSpec.getSize(widthMeasureSpec);
widthMeasureSpec = MeasureSpec.makeMeasureSpec( widthMeasureSpec = MeasureSpec.makeMeasureSpec(
Math.min(w, widthSize), EXACTLY); Math.min(w, widthSize), EXACTLY);
fixedWidth = true; fixedWidth = true;
} else { } else {
widthMeasureSpec = MeasureSpec.makeMeasureSpec( widthMeasureSpec = MeasureSpec.makeMeasureSpec(
widthMeasureSpec - mFloatingInsets.left - mFloatingInsets.right, widthSize - mFloatingInsets.left - mFloatingInsets.right,
AT_MOST); AT_MOST);
mApplyFloatingHorizontalInsets = true; mApplyFloatingHorizontalInsets = true;
} }