Merge remote-tracking branch 'remotes/upstream/resizeCache' into beta

diff --cc src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
index 8c36fa2,dd0a2cd..b9087bc
--- 1/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
--- 2/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
+++ b/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
@@@ -31,8 -29,7 +31,9 @@@ import org.apache.commons.httpclient.Ht
  import org.apache.commons.httpclient.methods.GetMethod;
  
  import android.accounts.Account;
 +import android.accounts.AccountManager;
 +import android.content.Context;
+ import android.content.SharedPreferences;
  import android.content.res.Resources;
  import android.graphics.Bitmap;
  import android.graphics.Bitmap.CompressFormat;
@@@ -47,11 -41,8 +48,12 @@@ import android.graphics.drawable.Drawab
  import android.media.ThumbnailUtils;
  import android.net.Uri;
  import android.os.AsyncTask;
+ import android.preference.PreferenceManager;
 +import android.view.Display;
 +import android.view.View;
 +import android.view.WindowManager;
  import android.widget.ImageView;
 +import android.widget.ProgressBar;
  
  import com.owncloud.android.MainApp;
  import com.owncloud.android.R;

diff --cc src/com/owncloud/android/ui/activity/Preferences.java
Simple merge