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

diff --cc res/values/strings.xml
index 3750f61,d16e9c5..7625c94
--- 1/res/values/strings.xml
--- 2/res/values/strings.xml
+++ b/res/values/strings.xml
@@@ -387,42 -364,7 +387,43 @@@
      <string name="file_list__footer__files">%1$d files</string>
      <string name="file_list__footer__files_and_folder">%1$d files, 1 folder</string>
      <string name="file_list__footer__files_and_folders">%1$d files, %2$d folders</string>
 +    <string name="action_switch_grid_view">Switch to grid view</string>
 +    <string name="action_switch_list_view">Switch to list view</string>
 +    <string name="common_category">Common</string>
 +    <string name="pref_cache_size">Cache size</string>
 +    <string name="prefs_instant_behaviour_dialogTitle">Upload file to server and ...</string>
 +    <string name="prefs_instant_behaviour_title">Behaviour</string>
 +    <string name="upload_copy_files">Copy file</string>
 +    <string name="upload_move_files">Move file</string>
 +    <string name="prefs_storage_path">Storage path</string>
 +    <string name="prefs_common">Common</string>
 +
 +    <string name="pref_behaviour_entries_do_nothing">do nothing</string>
 +    <string name="pref_behaviour_entries_copy">copy file to OC folder</string>
 +    <string name="pref_behaviour_entries_move">move file to OC folder</string>
 +    <string name="pref_behaviour_entries_delete">delete origin file</string>
 +    <string name="confirmation_remove_files_alert">Do you really want to remove selected items?</string>
 +    <string name="confirmation_remove_folders_alert">Do you really want to remove a folder and its content?</string>
 +    <string name="confirmation_remove_files">selected items</string>
 +    <string name="error_log_exit">Exit</string>
 +    <string name="error_log_send">Send Log</string>
 +    <string name="error_log_title">Error Log</string>
 +    <string name="action_stream_file">Stream file with external player</string>
 +    <string name="stream_expose_password">Do you want to stream this file with an external app?\n\nCAUTION: This may expose your password!</string>
      <string name="set_picture_as">Set picture as</string>
+     <string name="set_as">Set As</string>
  
 +    <string name="share_dialog_title">Sharing</string>
 +    <string name="share_with_user_section_title">Share with Users and Groups</string>
 +    <string name="share_no_users">No data shared with users yet</string>
 +    <string name="share_add_user_or_group">Add User or Group</string>
 +    <string name="share_search">Search</string>
 +
 +    <string name="search_users_and_groups_hint">Search users and groups</string>
 +    <string name="share_group_clarification">%1$s (group)</string>
 +
 +    <string name="share_sharee_unavailable">Sorry, your server version does not allow share with users within clients.
 +        \nPlease contact your administrator</string>
 +    <string name="changelog">https://github.com/owncloud/android/raw/beta/CHANGELOG.md</string>
 +
  </resources>

diff --cc src/com/owncloud/android/files/FileOperationsHelper.java
index 362cada,010d1ff..f5050d4
--- 1/src/com/owncloud/android/files/FileOperationsHelper.java
--- 2/src/com/owncloud/android/files/FileOperationsHelper.java
+++ b/src/com/owncloud/android/files/FileOperationsHelper.java
@@@ -349,26 -245,15 +349,27 @@@ public class FileOperationsHelper 
                  Intent intent = new Intent(Intent.ACTION_ATTACH_DATA);
                  intent.setDataAndType(sendUri, file.getMimetype());
                  intent.putExtra("mimeType", file.getMimetype());
-                 mFileActivity.startActivityForResult(Intent.createChooser(intent, "Set As"), 200);
+                 mFileActivity.startActivityForResult(Intent.createChooser(intent,
+                                                     mFileActivity.getString(R.string.set_as)), 200);
              } else {
 -//                 TODO re-enable after resized images is available
 -//                Uri sendUri = Uri.parse("content://" + DiskLruImageCacheFileProvider.AUTHORITY + file.getRemotePath());
 -//                Intent intent = new Intent(Intent.ACTION_ATTACH_DATA);
 -//                intent.setDataAndType(sendUri, file.getMimetype());
 -//                intent.putExtra("mimeType", file.getMimetype());
 -//                mFileActivity.startActivityForResult(Intent.createChooser(intent, "Set As"), 200);
 +                // TODO re-enable after resized images is available
 +                Uri sendUri = Uri.parse("content://" + DiskLruImageCacheFileProvider.AUTHORITY + file.getRemotePath());
 +                Intent intent = new Intent(Intent.ACTION_ATTACH_DATA);
 +                intent.setDataAndType(sendUri, file.getMimetype());
 +                intent.putExtra("mimeType", file.getMimetype());
 +                mFileActivity.startActivityForResult(Intent.createChooser(intent, "Set As"), 200);
 +
 +//                Intent sendIntent = new Intent(android.content.Intent.ACTION_SEND);
 +//                // set MimeType
 +//                sendIntent.setType(file.getMimetype());
 +////            sendIntent.putExtra(Intent.EXTRA_STREAM, Uri.parse("content://" + DiskLruImageCacheFileProvider.AUTHORITY + "/#" + file.getRemoteId() + "#" + file.getFileName()));
 +//                sendIntent.putExtra(Intent.EXTRA_STREAM, Uri.parse("content://" + DiskLruImageCacheFileProvider.AUTHORITY + file.getRemotePath()));
 +//                sendIntent.putExtra(Intent.ACTION_SEND, true);      // Send Action
 +//
 +//                // Show dialog, without the own app
 +//                String[] packagesToExclude = new String[] { mFileActivity.getPackageName() };
 +//                DialogFragment chooserDialog = ShareLinkToDialog.newInstance(sendIntent, packagesToExclude, file);
 +//                chooserDialog.show(mFileActivity.getSupportFragmentManager(), FTAG_CHOOSER_DIALOG);
              }
          } else {
              Log_OC.wtf(TAG, "Trying to send a NULL OCFile");