Reverted DownloadActivity and ImageLoader changes, updated icons, tweaked icon padding

AndroidManifest.xml

@@ -2,7 +2,7 @@
 <manifest xmlns:a="http://schemas.android.com/apk/res/android"
           package="net.sourceforge.subsonic.androidapp"
           a:versionCode="47"
-          a:versionName="3.9.9" a:installLocation="auto">
+          a:versionName="3.9.9.1" a:installLocation="auto">
 
     <uses-permission a:name="android.permission.INTERNET"/>
     <uses-permission a:name="android.permission.READ_PHONE_STATE"/>

default.properties

@@ -0,0 +1,11 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must be checked in Version Control Systems.
+#
+# To customize properties used by the Ant build system use,
+# "ant.properties", and override values to adapt the script to your
+# project structure.
+
+# Project target.
+target=android-15

res/layout-land/download.xml

@@ -191,11 +191,10 @@
                 >
 
             <FrameLayout
-                a:id="@+id/download_album_art_layout"
-                a:layout_width="fill_parent"
-                a:layout_height="fill_parent"
-                a:background="@drawable/pinstripe_tile" >
-
+                    a:id="@+id/download_album_art_layout"
+                    a:layout_width="fill_parent"
+                    a:layout_height="fill_parent"
+                    a:background="@drawable/album_art_background">
                 <ImageView
                         a:id="@+id/download_album_art_image"
                         a:layout_width="wrap_content"

res/layout-port/download.xml

@@ -11,12 +11,12 @@
                  a:layout_weight="1">
 
         <RelativeLayout
-            a:id="@+id/download_album_art_layout"
-            a:layout_width="fill_parent"
-            a:layout_height="fill_parent"
-            a:layout_weight="1"
-            a:background="@drawable/pinstripe_tile"
-            a:orientation="vertical" >
+                a:id="@+id/download_album_art_layout"
+                a:orientation="vertical"
+                a:layout_width="fill_parent"
+                a:layout_height="fill_parent"
+                a:layout_weight="1"
+                a:background="@drawable/album_art_background">
 
             <ImageButton
                     a:id="@+id/download_repeat"
@@ -40,7 +40,7 @@
                     a:layout_gravity="top|right"
                     a:layout_below="@+id/download_repeat"
                     a:paddingTop="12dip"
-                    a:paddingLeft="14dip"
+                    a:paddingLeft="0dip"
                     a:paddingBottom="15dip"/>
 
             <Button
@@ -140,7 +140,7 @@
             a:background="@drawable/list_selector_holo_dark"
             a:paddingBottom="12dip"
             a:paddingLeft="8dip"
-            a:paddingTop="24dip"
+            a:paddingTop="12dip"
             a:src="@drawable/ic_menu_moreoverflow" />
 
         <ImageButton

src/net/sourceforge/subsonic/androidapp/util/ImageLoader.java

@@ -66,8 +66,7 @@ public class ImageLoader implements Runnable {
         // Determine the density-dependent image sizes.
         imageSizeDefault = context.getResources().getDrawable(R.drawable.unknown_album).getIntrinsicHeight();
         DisplayMetrics metrics = context.getResources().getDisplayMetrics();
-        /*imageSizeLarge = (int) Math.round(Math.min(metrics.widthPixels, metrics.heightPixels) * 0.6);*/
-        imageSizeLarge = (int) Math.round(Math.min(metrics.widthPixels, metrics.heightPixels));
+        imageSizeLarge = (int) Math.round(Math.min(metrics.widthPixels, metrics.heightPixels) * 0.6);
 
         for (int i = 0; i < CONCURRENCY; i++) {
             new Thread(this, "ImageLoader").start();
@@ -99,7 +98,7 @@ public class ImageLoader implements Runnable {
         if (!large) {
             setUnknownImage(view, large);
         }
-        queue.offer(new Task(view, entry, size, false, large, crossfade));
+        queue.offer(new Task(view, entry, size, large, large, crossfade));
     }
 
     private String getKey(String coverArtId, int size) {