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

Merge "DO NOT MERGE : Fix measuring with outset for orientation" into klp-modular-dev

Browse Source
This commit is contained in:
Michael Kolb
2014-06-16 20:48:21 +00:00
committed by Android (Google) Code Review
parent d3843038b9 ee028d502e
commit a730881d76
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
policy/src/com/android/internal/policy/impl/PhoneWindow.java
View File

@@ -2259,7 +2259,6 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
final DisplayMetrics metrics = getContext().getResources().getDisplayMetrics(); final DisplayMetrics metrics = getContext().getResources().getDisplayMetrics();
final boolean isPortrait = metrics.widthPixels < metrics.heightPixels; final boolean isPortrait = metrics.widthPixels < metrics.heightPixels;
final int widthMode = getMode(widthMeasureSpec); final int widthMode = getMode(widthMeasureSpec);
final int heightMode = getMode(heightMeasureSpec); final int heightMode = getMode(heightMeasureSpec);
@@ -2306,11 +2305,17 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
if (mOutsetBottom != null) { if (mOutsetBottom != null) {
int mode = MeasureSpec.getMode(heightMeasureSpec); int mode = MeasureSpec.getMode(heightMeasureSpec);
if (mode != MeasureSpec.UNSPECIFIED) { if (mode != MeasureSpec.UNSPECIFIED && !isPortrait) {
int outset = (int) mOutsetBottom.getDimension(metrics); int outset = (int) mOutsetBottom.getDimension(metrics);
int height = MeasureSpec.getSize(heightMeasureSpec); int height = MeasureSpec.getSize(heightMeasureSpec);
heightMeasureSpec = MeasureSpec.makeMeasureSpec(height + outset, mode); heightMeasureSpec = MeasureSpec.makeMeasureSpec(height + outset, mode);
} }
mode = MeasureSpec.getMode(widthMeasureSpec);
if (mode != MeasureSpec.UNSPECIFIED && isPortrait) {
int outset = (int) mOutsetBottom.getDimension(metrics);
int width = MeasureSpec.getSize(widthMeasureSpec);
widthMeasureSpec = MeasureSpec.makeMeasureSpec(width + outset, mode);
}
} }
super.onMeasure(widthMeasureSpec, heightMeasureSpec); super.onMeasure(widthMeasureSpec, heightMeasureSpec);