From: tobiasKaminsky <tobias@kaminsky.me>
Date: Fri, 6 Nov 2015 16:35:52 +0000 (+0100)
Subject: Merge branch 'setAsWallpaper' into beta
X-Git-Tag: beta-20151122~31
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/9248c9263676274636d68473367aa01f2c5fd523

Merge branch 'setAsWallpaper' into beta
---

9248c9263676274636d68473367aa01f2c5fd523
diff --cc src/com/owncloud/android/files/FileMenuFilter.java
index 917f9365,ca3b10bf..e6638ba0
--- a/src/com/owncloud/android/files/FileMenuFilter.java
+++ b/src/com/owncloud/android/files/FileMenuFilter.java
@@@ -237,13 -227,13 +237,20 @@@ public class FileMenuFilter 
              toShow.add(R.id.action_unfavorite_file);
          }
  
 +        // STREAM
 +        if (mFile != null && !mFile.isDown() && (mFile.isAudio() || mFile.isVideo())){
 +            toShow.add(R.id.action_stream_file);
 +        } else {
 +            toHide.add(R.id.action_stream_file);
 +        }
 +
+         // SET PICTURE AS
+         if (mFile == null || !mFile.isImage()){
+             toHide.add(R.id.action_set_as_wallpaper);
+         } else {
+             toShow.add(R.id.action_set_as_wallpaper);
+         }
+ 
      }
  
  }