Merge branch 'develop' into release-1.6.0

diff --combined res/values/strings.xml
index 3208bf1,dd5fe98..d80a79b
--- 1/res/values/strings.xml
--- 2/res/values/strings.xml
+++ b/res/values/strings.xml
@@@ -283,8 -283,13 +283,13 @@@
  
        <string name="prefs_category_accounts">Accounts</string>
        <string name="prefs_add_account">Add account</string>
 -      <string name="auth_redirect_non_secure_connection_title">Secure connection is redirected through an unsecured route.</string>
 +      <string name="auth_redirect_non_secure_connection_title">Secure connection is redirected to an unsecured route.</string>
  
+       <string name="actionbar_logger">Logs</string>
+       <string name="log_send_history_button">Send History</string>
+       <string name="log_mail_subject">Owncloud Android app logs</string>
+       <string name="log_progress_dialog_text">Loading data...</string>
+ 
        <string name="saml_authentication_required_text">Authentication required</string>
        <string name="saml_authentication_wrong_pass">Wrong password</string>
        <string name="actionbar_move">Move</string>

diff --combined src/com/owncloud/android/ui/preview/FileDownloadFragment.java
index ebcf042,b8489b5..98bbda3
--- 1/src/com/owncloud/android/ui/preview/FileDownloadFragment.java
--- 2/src/com/owncloud/android/ui/preview/FileDownloadFragment.java
+++ b/src/com/owncloud/android/ui/preview/FileDownloadFragment.java
@@@ -23,7 -23,6 +23,6 @@@ import com.owncloud.android.R
  import com.owncloud.android.datamodel.OCFile;
  import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;
  import com.owncloud.android.ui.fragment.FileFragment;
- import com.owncloud.android.utils.Log_OC;
  
  import android.accounts.Account;
  import android.os.Bundle;
@@@ -33,11 -32,11 +32,12 @@@ import android.view.View
  import android.view.View.OnClickListener;
  import android.view.ViewGroup;
  import android.widget.ImageButton;
 +import android.widget.LinearLayout;
  import android.widget.ProgressBar;
  import android.widget.TextView;
  
  import com.owncloud.android.lib.common.network.OnDatatransferProgressListener;
+ import com.owncloud.android.lib.common.utils.Log_OC;
  
  
  /**
@@@ -127,13 -126,6 +127,13 @@@ public class FileDownloadFragment exten
          
          ((ImageButton)mView.findViewById(R.id.cancelBtn)).setOnClickListener(this);
          
 +        ((LinearLayout)mView.findViewById(R.id.fileDownloadLL)).setOnClickListener(new OnClickListener() {
 +            @Override
 +            public void onClick(View v) {
 +                ((PreviewImageActivity) getActivity()).toggleFullScreen();
 +            }
 +        });
 +
          if (mError) {
              setButtonsForRemote();
          } else {

diff --combined src/com/owncloud/android/ui/preview/PreviewImageFragment.java
index 98296da,8e3afaf..51585c6
--- 1/src/com/owncloud/android/ui/preview/PreviewImageFragment.java
--- 2/src/com/owncloud/android/ui/preview/PreviewImageFragment.java
+++ b/src/com/owncloud/android/ui/preview/PreviewImageFragment.java
@@@ -19,12 -19,16 +19,12 @@@ package com.owncloud.android.ui.preview
  import java.lang.ref.WeakReference;
  
  import android.accounts.Account;
 -import android.annotation.SuppressLint;
  import android.app.Activity;
  import android.graphics.Bitmap;
  import android.graphics.BitmapFactory;
 -import android.graphics.BitmapFactory.Options;
 -import android.graphics.Point;
  import android.os.AsyncTask;
  import android.os.Bundle;
  import android.support.v4.app.FragmentStatePagerAdapter;
 -import android.view.Display;
  import android.view.LayoutInflater;
  import android.view.View;
  import android.view.View.OnClickListener;
@@@ -40,10 -44,10 +40,10 @@@ import com.ortiz.touch.TouchImageView
  import com.owncloud.android.R;
  import com.owncloud.android.datamodel.OCFile;
  import com.owncloud.android.files.FileMenuFilter;
+ import com.owncloud.android.lib.common.utils.Log_OC;
  import com.owncloud.android.ui.dialog.ConfirmationDialogFragment;
  import com.owncloud.android.ui.dialog.RemoveFileDialogFragment;
  import com.owncloud.android.ui.fragment.FileFragment;
- import com.owncloud.android.utils.Log_OC;
  
  
  /**
@@@ -359,14 -363,58 +359,14 @@@ public class PreviewImageFragment exten
          }
          
          
 -        @SuppressWarnings("deprecation")
 -        @SuppressLint({ "NewApi", "NewApi", "NewApi" }) // to avoid Lint errors since Android SDK r20
                @Override
          protected Bitmap doInBackground(String... params) {
              Bitmap result = null;
              if (params.length != 1) return result;
              String storagePath = params[0];
              try {
 -                // set desired options that will affect the size of the bitmap
 -                BitmapFactory.Options options = new Options();
 -                options.inScaled = true;
 -                options.inPurgeable = true;
 -                if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.GINGERBREAD_MR1) {
 -                    options.inPreferQualityOverSpeed = false;
 -                }
 -                if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.HONEYCOMB) {
 -                    options.inMutable = false;
 -                }
 -                // make a false load of the bitmap - just to be able to read outWidth, outHeight and outMimeType
 -                options.inJustDecodeBounds = true;
 -                BitmapFactory.decodeFile(storagePath, options);   
 -                
 -                int width = options.outWidth;
 -                int height = options.outHeight;
 -                int scale = 1;
 -                
 -                Display display = getActivity().getWindowManager().getDefaultDisplay();
 -                Point size = new Point();
 -                int screenWidth;
 -                int screenHeight;
 -                if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.HONEYCOMB_MR2) {
 -                    display.getSize(size);
 -                    screenWidth = size.x;
 -                    screenHeight = size.y;
 -                } else {
 -                    screenWidth = display.getWidth();
 -                    screenHeight = display.getHeight();
 -                }
 -
 -                if (width > screenWidth) {
 -                    // second try to scale down the image , this time depending upon the screen size 
 -                    scale = (int) Math.floor((float)width / screenWidth);
 -                }
 -                if (height > screenHeight) {
 -                    scale = Math.max(scale, (int) Math.floor((float)height / screenHeight));
 -                }
 -                options.inSampleSize = scale;
 -
 -                // really load the bitmap
 -                options.inJustDecodeBounds = false; // the next decodeFile call will be real
 -                result = BitmapFactory.decodeFile(storagePath, options);
 -                //Log_OC.d(TAG, "Image loaded - width: " + options.outWidth + ", loaded height: " + options.outHeight);
 +                //Decode file into a bitmap in real size for being able to make zoom on the image
 +                result = BitmapFactory.decodeFile(storagePath);
  
                  if (result == null) {
                      mErrorMessageId = R.string.preview_image_error_unknown_format;