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

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

Browse Source 
* commit 'bf184875ef4dc41024474840641c6fc9d3a9e975':
  Fix adjustViewBounds handling for ImageView
This commit is contained in:
Adam Powell
2012-09-26 15:30:46 -07:00
committed by Android Git Automerger
parent 4a2357b634 bf184875ef
commit cbc289ae0c
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) {
int newWidth = (int)(desiredAspect * (heightSize - ptop - pbottom)) +
pleft + pright;
widthSize = resolveAdjustedSize(newWidth, mMaxWidth, widthMeasureSpec);
if (newWidth <= widthSize) {
widthSize = newWidth;
done = true;
@@ -799,6 +800,7 @@ public class ImageView extends View {
if (!done && resizeHeight) {
int newHeight = (int)((widthSize - pleft - pright) / desiredAspect) +
ptop + pbottom;
heightSize = resolveAdjustedSize(newHeight, mMaxHeight, heightMeasureSpec);
if (newHeight <= heightSize) {
heightSize = newHeight;
}