Adjust UI layout for photos

MyTracks/res/layout/list_item.xml

@@ -68,12 +68,12 @@ limitations under the License.
         </TableLayout>
         <ImageView
           android:id="@+id/list_item_photo"
-          android:layout_gravity="center"
+          android:adjustViewBounds="true"
           android:layout_height="wrap_content"
           android:layout_marginLeft="8dp"
           android:layout_weight="1"
           android:layout_width="0dp"
-          android:scaleType="centerCrop" />
+          android:scaleType="fitStart" />
       </LinearLayout>
       <TableLayout
         android:layout_height="wrap_content"

MyTracks/res/layout/marker_detail_fragment.xml

@@ -27,10 +27,11 @@ limitations under the License.
       android:layout_width="match_parent"
       android:orientation="vertical" >
       <ImageView
+        android:adjustViewBounds="true"
         android:id="@+id/marker_detail_waypoint_photo"
         android:layout_height="wrap_content"
         android:layout_width="match_parent"
-        android:scaleType="centerInside" />
+        android:scaleType="fitStart" />
       <TextView
         android:id="@+id/marker_detail_waypoint_name"
         style="@style/TextLarge.WithTopMargin" />

MyTracks/src/com/google/android/apps/mytracks/fragments/MarkerDetailFragment.java

@@ -181,7 +181,7 @@ public class MarkerDetailFragment extends Fragment {
         @SuppressWarnings("deprecation")
         int displayHeight = defaultDisplay.getHeight();
         bitmap = PhotoUtils.setImageVew(
-            imageView, Uri.parse(photoUrl), displayWidth, displayHeight, true);
+            imageView, Uri.parse(photoUrl), displayWidth, displayHeight);
       }
 
       TextView name = (TextView) getView().findViewById(R.id.marker_detail_waypoint_name);

MyTracks/src/com/google/android/apps/mytracks/util/ListItemUtils.java

@@ -96,7 +96,7 @@ public class ListItemUtils {
       Display defaultDisplay = activity.getWindowManager().getDefaultDisplay();
       // Set the initial width to 35% of the display width
       int width = (int) (defaultDisplay.getWidth() * .35);
-      PhotoUtils.setImageVew(photo, Uri.parse(photoUrl), width, 0, false);
+      PhotoUtils.setImageVew(photo, Uri.parse(photoUrl), width, 0);
     }
 
     // Set date/time

MyTracks/src/com/google/android/apps/mytracks/util/PhotoUtils.java

@@ -44,11 +44,9 @@ public class PhotoUtils {
    * @param uri the image uri
    * @param displayWidth the display width
    * @param displayHeight the display height
-   * @param fitWithIn true to fit within the display area. False to crop and fill
-   *          the display area.
    */
   public static Bitmap setImageVew(
-      ImageView imageView, Uri uri, int displayWidth, int displayHeight, boolean fitWithIn) {
+      ImageView imageView, Uri uri, int displayWidth, int displayHeight) {
     
     // Get the image dimensions
     BitmapFactory.Options options = new BitmapFactory.Options();
@@ -61,7 +59,6 @@ public class PhotoUtils {
     int targetHeight = displayHeight;
     if (targetHeight == 0) {
       targetHeight = (int) (targetWidth * ((float) options.outHeight / (float) options.outWidth));
-      imageView.getLayoutParams().height = targetHeight;
     }
     
     // Set imageWidth and imageHeight based on image rotation
@@ -79,8 +76,7 @@ public class PhotoUtils {
 
     // Get a scaled down version of the image
     options.inJustDecodeBounds = false;
-    options.inSampleSize = getInSampleSize(
+    options.inSampleSize = getInSampleSize(imageWidth, imageHeight, targetWidth, targetHeight);
-        imageWidth, imageHeight, targetWidth, targetHeight, fitWithIn);
     options.inPurgeable = true;
 
     Bitmap scaledBitmap = BitmapFactory.decodeFile(uri.getPath(), options);
@@ -133,11 +129,9 @@ public class PhotoUtils {
    * @param imageHeight the image height
    * @param targetWidth the target width
    * @param targetHeight the target height
-   * @param fitWithin true to fit within the target area. False to crop and fill
-   *          all target area.
    */
   private static int getInSampleSize(
-      int imageWidth, int imageHeight, int targetWidth, int targetHeight, boolean fitWithin) {
+      int imageWidth, int imageHeight, int targetWidth, int targetHeight) {
     float widthRatio = 1;
     if (imageWidth > targetWidth) {
       widthRatio = (float) imageWidth / (float) targetWidth;
@@ -150,11 +144,9 @@ public class PhotoUtils {
 
     /*
      * To fit within the target area, return the larger sample ratio so the
-     * image will not be larger than the target dimensions. To crop and fill the
+     * image will not be larger than the target dimensions. Use Math.floor to
-     * target area, return the smaller sample ratio so the image will be greater
+     * not under sample.
-     * than the target dimensions. Use Math.floor to not under sample.
      */
-    return (int) Math.floor(
+    return (int) Math.floor(Math.max(widthRatio, heightRatio));
-        fitWithin ? Math.max(widthRatio, heightRatio) : Math.min(widthRatio, heightRatio));
   }
 }