diff options
author | Taesu Lee <taesu82.lee@samsung.com> | 2020-01-21 15:39:39 +0900 |
---|---|---|
committer | Luca Stefani <luca.stefani.ge1@gmail.com> | 2020-03-16 16:29:45 +0100 |
commit | cb8979e038d1c74339a2d05eeec19b91acff20d9 (patch) | |
tree | 79ed0d8fdaf69957c1a36ff4c4c2f8e08c1864d4 /tests | |
parent | 2151ff224d657573595aeff2d547b1dd48ab683e (diff) | |
download | android_packages_apps_Messaging-cb8979e038d1c74339a2d05eeec19b91acff20d9.tar.gz android_packages_apps_Messaging-cb8979e038d1c74339a2d05eeec19b91acff20d9.tar.bz2 android_packages_apps_Messaging-cb8979e038d1c74339a2d05eeec19b91acff20d9.zip |
Support video attachments through GalleryMediaChooser
GalleryMediaChooser supports video types and more image types also. And
video thumbnails are overlaid with the play button image to distinguish
between images and videos.
Note:
1. EXTRA_ALLOW_MULTIPLE is not specified for ACTION_GET_CONTENT.
2. Files, methods and variables' name are still including "image".
3. Content descriptions are not updated.
Test: Manual
Change-Id: I961928f150e4ae8ee80a1fba2f20c37fb5426669
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/src/com/android/messaging/datamodel/data/TestDataFactory.java | 2 | ||||
-rw-r--r-- | tests/src/com/android/messaging/ui/mediapicker/MediaPickerTest.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/src/com/android/messaging/datamodel/data/TestDataFactory.java b/tests/src/com/android/messaging/datamodel/data/TestDataFactory.java index 8527e2b..033caa2 100644 --- a/tests/src/com/android/messaging/datamodel/data/TestDataFactory.java +++ b/tests/src/com/android/messaging/datamodel/data/TestDataFactory.java @@ -279,7 +279,7 @@ public class TestDataFactory { new Object[] { Long.valueOf(1), "/sdcard/image2", 200, 200, "image/png" }, new Object[] { Long.valueOf(2), "/sdcard/image3", 300, 300, "image/jpeg" }, }; - return new FakeCursor(GalleryGridItemData.IMAGE_PROJECTION, sGalleryCursorColumns, + return new FakeCursor(GalleryGridItemData.MEDIA_PROJECTION, sGalleryCursorColumns, cursorData); } diff --git a/tests/src/com/android/messaging/ui/mediapicker/MediaPickerTest.java b/tests/src/com/android/messaging/ui/mediapicker/MediaPickerTest.java index 4a7040e..eaf9338 100644 --- a/tests/src/com/android/messaging/ui/mediapicker/MediaPickerTest.java +++ b/tests/src/com/android/messaging/ui/mediapicker/MediaPickerTest.java @@ -97,7 +97,7 @@ public class MediaPickerTest extends FragmentTestCase<MediaPicker> { public void testDefaultTabs() { Mockito.when(mMockMediaPickerData.getSelectedChooserIndex()).thenReturn(0); initFragment(MediaPicker.MEDIA_TYPE_ALL, new Integer[] { - MediaPickerData.GALLERY_IMAGE_LOADER }, + MediaPickerData.GALLERY_MEDIA_LOADER }, false); final MediaPicker mediaPicker = getFragment(); final View view = mediaPicker.getView(); @@ -114,7 +114,7 @@ public class MediaPickerTest extends FragmentTestCase<MediaPicker> { public void testFilterTabsBeforeAttach() { Mockito.when(mMockMediaPickerData.getSelectedChooserIndex()).thenReturn(0); initFragment(MediaPicker.MEDIA_TYPE_IMAGE, new Integer[] { - MediaPickerData.GALLERY_IMAGE_LOADER }, + MediaPickerData.GALLERY_MEDIA_LOADER }, true); final MediaPicker mediaPicker = getFragment(); final View view = mediaPicker.getView(); |