From: tobiasKaminsky <tobias@kaminsky.me>
Date: Sun, 29 Nov 2015 13:37:17 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/upstream/resizeCache' into beta
X-Git-Tag: beta-20151129~5
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/b9f8b0941a8f3af54ad511c9c199663cccf5eced?ds=inline

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

b9f8b0941a8f3af54ad511c9c199663cccf5eced
diff --cc src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
index 8c36fa2e,dd0a2cdc..b9087bcc
--- a/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;