Commit: 2d8f1f6a97383b1431d180da74dc3e049ad959c8 - packages-apps-FileManager (git)

packages/apps/FileManager

Commit MetaInfo

• Révision: 2d8f1f6a97383b1431d180da74dc3e049ad959c8 (tree)
• l'heure: 2011-06-29 14:37:58
• Auteur: Joe Berria <nexesdevelopment@gmai...>
• Commiter: Joe Berria

Message de Log

fixed problem with slow loading thumbnails.

Change Summary

• modified: src/com/nexes/manager/tablet/DirContentActivity.java
• modified: src/com/nexes/manager/tablet/ThumbnailCreator.java

Modification

--- a/src/com/nexes/manager/tablet/DirContentActivity.java
+++ b/src/com/nexes/manager/tablet/DirContentActivity.java
@@ -81,6 +81,7 @@ public class DirContentActivity extends Fragment implements OnItemClickListener,
 	private FileManager mFileMang;
 	private EventHandler mHandler;
 	private MultiSelectHandler mMultiSelect;
+	private ThumbnailCreator mThumbnail;
 	private static OnBookMarkAddListener mBookmarkList;
 	
 	private LinearLayout mPathView, mMultiSelectView;
@@ -467,6 +468,9 @@ public class DirContentActivity extends Fragment implements OnItemClickListener,
 		}
 		
 		if(file.isDirectory() && !mActionModeSelected ) {
+			if (mThumbnail != null)
+				mThumbnail = null;
+			
 			addBackButton(name, true);
 
 		} else if (!file.isDirectory() && !mActionModeSelected ) {
@@ -616,6 +620,9 @@ public class DirContentActivity extends Fragment implements OnItemClickListener,
 		if(mActionModeSelected || mMultiSelectOn)
 			return;
 		
+		if (mThumbnail != null)
+			mThumbnail = null;
+		
 		mData = mFileMang.setHomeDir(name);
 		mDelegate.notifyDataSetChanged();
 		
@@ -870,20 +877,20 @@ public class DirContentActivity extends Fragment implements OnItemClickListener,
     	private final int GB = MG * KB;
     	
 		private DataViewHolder mHolder;
-		private ThumbnailCreator mThumbnail;
 		private String mName;
 		
 		public DataAdapter(Context context, int layout, ArrayList<String> data) {
 			super(context, layout, data);			
-			mThumbnail = new ThumbnailCreator(72, 72);
-			
 		}
 		
 		@Override
 		public View getView(int position, View view, ViewGroup parent) {
 			String ext;
 			File file = null;
-			String current = mFileMang.getCurrentDir();		
+			String current = mFileMang.getCurrentDir();
+			
+			if (mThumbnail == null)
+				mThumbnail = new ThumbnailCreator(72, 72);
 
 			mName = mData.get(position);
 			file = new File(current + "/" + mName);
@@ -973,15 +980,16 @@ public class DirContentActivity extends Fragment implements OnItemClickListener,
 					if (thumb == null) {
 						final Handler handle = new Handler(new Handler.Callback() {
 							public boolean handleMessage(Message msg) {
-								mHolder.mIcon.setImageDrawable((BitmapDrawable)msg.obj);
-								mHolder.mIcon.setScaleType(ScaleType.CENTER);
 								notifyDataSetChanged();
 								
 								return true;
 							}
 						});
+										
+						mThumbnail.createNewThumbnail(mData, mFileMang.getCurrentDir(), handle);
 						
-						mThumbnail.createNewThumbnail(file.getPath(), handle);
+						if (!mThumbnail.isAlive()) 
+							mThumbnail.start();
 						
 					} else {
 						mHolder.mIcon.setImageDrawable(thumb);

--- a/src/com/nexes/manager/tablet/ThumbnailCreator.java
+++ b/src/com/nexes/manager/tablet/ThumbnailCreator.java
@@ -24,18 +24,22 @@ import android.graphics.drawable.BitmapDrawable;
 import android.os.Handler;
 import android.os.Message;
 import android.view.Gravity;
-import android.util.Log;
 
 import java.lang.ref.SoftReference;
 import java.util.HashMap;
+import java.util.ArrayList;
 import java.io.File;
 
-public class ThumbnailCreator {
-	
+public class ThumbnailCreator extends Thread {
 	private int mWidth;
 	private int mHeight;
 	private SoftReference<Bitmap> mThumb;
 	private static HashMap<String, BitmapDrawable> mCacheMap = null;
+	
+	//test vars
+	private ArrayList<String> files;
+	private String dir;
+	private Handler handler;
 
 	public ThumbnailCreator(int width, int height) {
 		mHeight = height;
@@ -49,51 +53,72 @@ public class ThumbnailCreator {
 		return mCacheMap.get(name);
 	}
 
-	/*
-	 * This needs to be done properly. 
-	 */
-	public void createNewThumbnail(final String imageName, final Handler handler) {		
-		Thread thread = new Thread() {
+	@Override
+	public void run() {
+		int len = files.size();
+		
+		for (int i = 0; i < len; i++) {			
+			final File file = new File(dir + "/" + files.get(i));
 			
-			public void run() {
-				File file = new File(imageName);
+			if (isImageFile(file.getName())) {
 				long len_kb = file.length() / 1024;
-							
+				
 				BitmapFactory.Options options = new BitmapFactory.Options();
 				options.outWidth = mWidth;
 				options.outHeight = mHeight;
 					
-				if (len_kb > 400 && len_kb < 1600) {
+				if (len_kb > 500 && len_kb < 2000) {
 					options.inSampleSize = 16;
-					mThumb = new SoftReference<Bitmap>(BitmapFactory.decodeFile(imageName, options));
+					options.inPurgeable = true;
+					options.inPreferQualityOverSpeed = false;
+					mThumb = new SoftReference<Bitmap>(BitmapFactory.decodeFile(file.getPath(), options));
 										
-				} else if (len_kb >= 1600) {
+				} else if (len_kb >= 2000) {
 					options.inSampleSize = 32;
-					mThumb = new SoftReference<Bitmap>(BitmapFactory.decodeFile(imageName, options));
+					options.inPurgeable = true;
+					options.inPreferQualityOverSpeed = false;
+					mThumb = new SoftReference<Bitmap>(BitmapFactory.decodeFile(file.getPath(), options));
 									
-				} else if (len_kb <= 400) {
+				} else if (len_kb <= 500) {
+					options.inPurgeable = true;
 					mThumb = new SoftReference<Bitmap>(Bitmap.createScaledBitmap(
-							 						   BitmapFactory.decodeFile(imageName),
+							 						   BitmapFactory.decodeFile(file.getPath()),
 							 						   mWidth,
 							 						   mHeight,
 							 						   false));
 				}
 				
-				BitmapDrawable d = new BitmapDrawable(mThumb.get());
+				final BitmapDrawable d = new BitmapDrawable(mThumb.get());
+				
 				d.setGravity(Gravity.CENTER);
-				mCacheMap.put(imageName, d);
+				mCacheMap.put(file.getPath(), d);
 				
 				handler.post(new Runnable() {
 					@Override
 					public void run() {
 						Message msg = handler.obtainMessage();
-						msg.obj = (BitmapDrawable)mCacheMap.get((imageName));
+						msg.obj = (BitmapDrawable)d;
 						msg.sendToTarget();
 					}
 				});
 			}
-		};
-		thread.start();
-
+		}
+	}
+	
+	public void createNewThumbnail(ArrayList<String> files,  String dir,  Handler handler) {
+		this.files = files;
+		this.dir = dir;
+		this.handler = handler;		
+	}
+	
+	private boolean isImageFile(String file) {
+		String ext = file.substring(file.lastIndexOf(".") + 1);
+		
+		if (ext.equalsIgnoreCase("png") || ext.equalsIgnoreCase("jpg") ||
+			ext.equalsIgnoreCase("jpeg")|| ext.equalsIgnoreCase("gif") ||
+			ext.equalsIgnoreCase("tiff")|| ext.equalsIgnoreCase("tif"))
+			return true;
+		
+		return false;
 	}
 }