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>
This commit is contained in:
@@ -63,7 +63,7 @@ class GalleryMediaChooser extends MediaChooser implements
|
||||
mAdapter.setHostInterface(null);
|
||||
// The loader is started only if startMediaPickerDataLoader() is called
|
||||
if (OsUtil.hasStoragePermission()) {
|
||||
mBindingRef.getData().destroyLoader(MediaPickerData.GALLERY_IMAGE_LOADER);
|
||||
mBindingRef.getData().destroyLoader(MediaPickerData.GALLERY_MEDIA_LOADER);
|
||||
}
|
||||
return super.destroyView();
|
||||
}
|
||||
@@ -121,7 +121,7 @@ class GalleryMediaChooser extends MediaChooser implements
|
||||
protected View createView(final ViewGroup container) {
|
||||
final LayoutInflater inflater = getLayoutInflater();
|
||||
final View view = inflater.inflate(
|
||||
R.layout.mediapicker_image_chooser,
|
||||
R.layout.mediapicker_gallery_chooser,
|
||||
container /* root */,
|
||||
false /* attachToRoot */);
|
||||
|
||||
@@ -167,7 +167,7 @@ class GalleryMediaChooser extends MediaChooser implements
|
||||
public void onMediaPickerDataUpdated(final MediaPickerData mediaPickerData, final Object data,
|
||||
final int loaderId) {
|
||||
mBindingRef.ensureBound(mediaPickerData);
|
||||
Assert.equals(MediaPickerData.GALLERY_IMAGE_LOADER, loaderId);
|
||||
Assert.equals(MediaPickerData.GALLERY_MEDIA_LOADER, loaderId);
|
||||
Cursor rawCursor = null;
|
||||
if (data instanceof Cursor) {
|
||||
rawCursor = (Cursor) data;
|
||||
@@ -202,8 +202,9 @@ class GalleryMediaChooser extends MediaChooser implements
|
||||
}
|
||||
|
||||
private void startMediaPickerDataLoader() {
|
||||
mBindingRef.getData().startLoader(MediaPickerData.GALLERY_IMAGE_LOADER, mBindingRef, null,
|
||||
this);
|
||||
mBindingRef
|
||||
.getData()
|
||||
.startLoader(MediaPickerData.GALLERY_MEDIA_LOADER, mBindingRef, null, this);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in New Issue
Block a user