Merge pull request #4738 from salachi/TIMOB-14395-ImageViewScaling

TIMOB-14395-if height or width not defined, set those keeping aspect rat...

android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiImageView.java

@@ -367,6 +367,32 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec)
 //			Log.i(LCAT, "w: " + w + " wm: " + wm + " h: " + h + " hm: " + hm);
 //		}
 
+		// If height or width is not defined, we need to set the height/width properly
+		// so that it doesn't get the content height/width
+		if (!viewWidthDefined || !viewHeightDefined) {
+			Drawable d = imageView.getDrawable();
+			float aspectRatio = 1;
+			int w = MeasureSpec.getSize(widthMeasureSpec);
+			int h = MeasureSpec.getSize(heightMeasureSpec);
+
+			if (d != null) {
+				int ih = d.getIntrinsicHeight();
+				int iw = d.getIntrinsicWidth();
+				if (ih != 0 && iw != 0) {
+					aspectRatio = ih / iw;
+				}
+			}
+
+			if (viewWidthDefined) {
+				maxWidth = w;
+				maxHeight = Math.round(w * aspectRatio);
+			}
+			if (viewHeightDefined) {
+				maxHeight = h;
+				maxWidth = Math.round(h / aspectRatio);
+			}
+		}
+
 		// TODO padding and margins
 
 		measureChild(imageView, widthMeasureSpec, heightMeasureSpec);