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

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 3750f61..7625c94 100644 (file)
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -411,6 +411,7 @@
     <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>

diff --git a/src/com/owncloud/android/files/FileOperationsHelper.java b/src/com/owncloud/android/files/FileOperationsHelper.java
index 362cada..f5050d4 100644 (file)
--- a/src/com/owncloud/android/files/FileOperationsHelper.java
+++ b/src/com/owncloud/android/files/FileOperationsHelper.java
@@ -349,7 +349,8 @@ 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());