From 932c00f4f15bc0f3b37ecedf02d9e3092730531f Mon Sep 17 00:00:00 2001 From: tobiasKaminsky Date: Mon, 2 Nov 2015 09:43:58 +0100 Subject: [PATCH] Merge branch 'setAsWallpaper' into beta # Conflicts: # res/values/strings.xml # src/com/owncloud/android/files/FileOperationsHelper.java --- src/com/owncloud/android/ui/preview/PreviewImageFragment.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/com/owncloud/android/ui/preview/PreviewImageFragment.java b/src/com/owncloud/android/ui/preview/PreviewImageFragment.java index 2e4ffb55..03737658 100644 --- a/src/com/owncloud/android/ui/preview/PreviewImageFragment.java +++ b/src/com/owncloud/android/ui/preview/PreviewImageFragment.java @@ -264,6 +264,9 @@ public class PreviewImageFragment extends FileFragment { public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { super.onCreateOptionsMenu(menu, inflater); inflater.inflate(R.menu.file_actions_menu, menu); + + MenuItem item = menu.findItem(R.id.action_set_as_wallpaper); + item.setVisible(getFile().isDown()); } /** -- 2.11.0