From: tobiasKaminsky <tobias@kaminsky.me>
Date: Sat, 31 Oct 2015 07:10:34 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/upstream/resizedImages' into beta
X-Git-Tag: beta-20151122~69
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/e6eb26a13057cdb4b5c3c67a624ebb1267111f4b

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

e6eb26a13057cdb4b5c3c67a624ebb1267111f4b
diff --cc src/com/owncloud/android/ui/preview/PreviewImageFragment.java
index c45f76cf,f05391ad..dc96b9f2
--- a/src/com/owncloud/android/ui/preview/PreviewImageFragment.java
+++ b/src/com/owncloud/android/ui/preview/PreviewImageFragment.java
@@@ -140,9 -141,10 +142,10 @@@ public class PreviewImageFragment exten
              // not right now
  
          mIgnoreFirstSavedState = args.getBoolean(ARG_IGNORE_FIRST);
+         mShowResizedImage = args.getBoolean(ARG_SHOW_RESIZED_IMAGE);
          setHasOptionsMenu(true);
      }
 -    
 +
  
      /**
       * {@inheritDoc}