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

Merge "Fix adjustViewBounds handling for ImageView" into jb-mr1-dev

Browse Source
This commit is contained in:
Adam Powell
2012-09-26 15:28:51 -07:00
committed by Android (Google) Code Review
parent 51ce1607b3 b1271ac183
commit bf184875ef
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/widget/ImageView.java
View File

@@ -789,6 +789,7 @@ public class ImageView extends View {
if (resizeWidth) { if (resizeWidth) {
int newWidth = (int)(desiredAspect * (heightSize - ptop - pbottom)) + int newWidth = (int)(desiredAspect * (heightSize - ptop - pbottom)) +
pleft + pright; pleft + pright;
widthSize = resolveAdjustedSize(newWidth, mMaxWidth, widthMeasureSpec);
if (newWidth <= widthSize) { if (newWidth <= widthSize) {
widthSize = newWidth; widthSize = newWidth;
done = true; done = true;
@@ -799,6 +800,7 @@ public class ImageView extends View {
if (!done && resizeHeight) { if (!done && resizeHeight) {
int newHeight = (int)((widthSize - pleft - pright) / desiredAspect) + int newHeight = (int)((widthSize - pleft - pright) / desiredAspect) +
ptop + pbottom; ptop + pbottom;
heightSize = resolveAdjustedSize(newHeight, mMaxHeight, heightMeasureSpec);
if (newHeight <= heightSize) { if (newHeight <= heightSize) {
heightSize = newHeight; heightSize = newHeight;
} }