Filter for images and video in add media picker

WordPress/src/main/java/org/wordpress/android/ui/RequestCodes.java

@@ -31,6 +31,7 @@ public class RequestCodes {
     public static final int PICTURE_LIBRARY = 2000;
     public static final int TAKE_PHOTO = 2100;
     public static final int VIDEO_LIBRARY = 2200;
+    public static final int MEDIA_LIBRARY = 2210;
     public static final int TAKE_VIDEO = 2300;
     public static final int CROP_PHOTO = 2400;
     public static final int PICTURE_LIBRARY_OR_CAPTURE = 2500;

WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java

@@ -3128,6 +3128,7 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
                         }
                     }
                     break;
+                case RequestCodes.MEDIA_LIBRARY:
                 case RequestCodes.PICTURE_LIBRARY:
                     advertiseImageOptimisationAndAddMedia(data);
                     break;
@@ -3546,8 +3547,14 @@ public void onCapturePhotoClicked() {
     }
 
     @Override
-    public void onAddVideoClicked(boolean allowMultipleSelectio) {
-        onPhotoPickerIconClicked(PhotoPickerIcon.ANDROID_CHOOSE_VIDEO, allowMultipleSelectio);
+    public void onAddVideoClicked(boolean allowMultipleSelection) {
+        onPhotoPickerIconClicked(PhotoPickerIcon.ANDROID_CHOOSE_VIDEO, allowMultipleSelection);
+    }
+
+    @Override
+    public void onAddMediaClicked(boolean allowMultipleSelection) {
+        mAllowMultipleSelection = allowMultipleSelection;
+        WPMediaUtils.launchMediaLibrary(this, mAllowMultipleSelection);
     }
 
     @Override

WordPress/src/main/java/org/wordpress/android/util/WPMediaUtils.java

@@ -220,6 +220,11 @@ public static void launchVideoLibrary(Activity activity, boolean multiSelect) {
                                         RequestCodes.VIDEO_LIBRARY);
     }
 
+    public static void launchMediaLibrary(Activity activity, boolean multiSelect) {
+        activity.startActivityForResult(prepareMediaLibraryIntent(activity, multiSelect),
+                RequestCodes.MEDIA_LIBRARY);
+    }
+
     private static Intent prepareVideoLibraryIntent(Context context, boolean multiSelect) {
         Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
         intent.setType("video/*");
@@ -229,6 +234,16 @@ private static Intent prepareVideoLibraryIntent(Context context, boolean multiSe
         return Intent.createChooser(intent, context.getString(R.string.pick_video));
     }
 
+    private static Intent prepareMediaLibraryIntent(Context context, boolean multiSelect) {
+        Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
+        intent.setType("*/*");
+        intent.putExtra(Intent.EXTRA_MIME_TYPES, new String[] {"image/*", "video/*"});
+        if (multiSelect) {
+            intent.putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true);
+        }
+        return Intent.createChooser(intent, context.getString(R.string.pick_media));
+    }
+
     public static void launchVideoCamera(Activity activity) {
         activity.startActivityForResult(prepareVideoCameraIntent(), RequestCodes.TAKE_VIDEO);
     }

WordPress/src/main/res/values/strings.xml

@@ -140,6 +140,7 @@
     <string name="wp_media_title">WordPress media</string>
     <string name="pick_photo">Select photo</string>
     <string name="pick_video">Select video</string>
+    <string name="pick_media">Select media</string>
     <string name="capture_or_pick_photo">Capture or select photo</string>
     <string name="reader_toast_err_get_post">Unable to retrieve this post</string>
     <string name="media_error_no_permission">You don\'t have permission to view the media library</string>

libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/EditorFragmentAbstract.java

@@ -178,6 +178,7 @@ public interface EditorFragmentListener {
         void onAddPhotoClicked(boolean allowMultipleSelection);
         void onCapturePhotoClicked();
         void onAddVideoClicked(boolean allowMultipleSelection);
+        void onAddMediaClicked(boolean allowMultipleSelection);
         void onCaptureVideoClicked();
         boolean onMediaRetryClicked(String mediaId);
         void onMediaRetryAllClicked(Set<String> mediaIdSet);

libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/GutenbergEditorFragment.java

@@ -242,6 +242,11 @@ public void onUploadVideoButtonClicked(boolean allowMultipleSelection) {
                         mEditorFragmentListener.onAddVideoClicked(allowMultipleSelection);
                     }
 
+                    @Override
+                    public void onUploadMediaButtonClicked(boolean allowMultipleSelection) {
+                        mEditorFragmentListener.onAddMediaClicked(allowMultipleSelection);
+                    }
+
                     @Override
                     public void onCaptureVideoButtonClicked() {
                         checkAndRequestCameraAndStoragePermissions(CAPTURE_VIDEO_PERMISSION_REQUEST_CODE);