diff options
| author | Steve Kondik <steve@cyngn.com> | 2015-10-17 23:43:31 -0700 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2015-10-18 12:42:35 -0700 |
| commit | 0455309dcd9af6dfdef5c72b6939ecceef935fe9 (patch) | |
| tree | 3215fdbd6ca52b8878b80df88591520ecc4187b5 /src/com/android/gallery3d/ui/AlbumSlotRenderer.java | |
| parent | bcbf7c98a521b9ee4a7d03e00dcfc469c9b3a398 (diff) | |
| download | android_packages_apps_Gallery2-0455309dcd9af6dfdef5c72b6939ecceef935fe9.tar.gz android_packages_apps_Gallery2-0455309dcd9af6dfdef5c72b6939ecceef935fe9.tar.bz2 android_packages_apps_Gallery2-0455309dcd9af6dfdef5c72b6939ecceef935fe9.zip | |
Gallery2: Revert DRM feature
* Missing framework support in M, revisit later.
Revert "Gallery2 : Drm file can be set as wallpaper"
This reverts commit b00985f4de70444fa5ece9e8a78a79e73f4475b1.
Revert "Gallery2 : Drm lock icon added on Photo widget for drm content"
This reverts commit 4f3e49619d3954056f899660cc764f3773d92141.
Revert "Gallery2 : GIF animated drm file can be visible in Gallery app"
This reverts commit f5b491b181839286f58d640ae690f1860ef19e8c.
Revert "Gallery2 : Delete and Details options are not visible on Camera preview"
This reverts commit 704bff736bda2bc5f6c5aa2956879f55101191f5.
Revert "Gallery2 : Video share option is not working"
This reverts commit ea87a93df185b9f8c1e477188b55a2fe97dc983e.
Revert "Gallery2 : Uses internal Drm image decoder api in Gallery app"
This reverts commit 01f5f347cf33813b51bd0865dc620d001c8d8735.
Revert "Gallery2 : Added support for Oma drm (CD and SD)"
This reverts commit 43044da1965c1b687695f3f4e1d44d3636496978.
Revert "Gallery2: Make Gallery2 support OMADRM feature"
This reverts commit 829f9ad8c06070038cdef24e5fac76a8a16f841b.
Change-Id: I4300285fd8539eb2e3134a0e472a087b83a0228f
Diffstat (limited to 'src/com/android/gallery3d/ui/AlbumSlotRenderer.java')
| -rw-r--r-- | src/com/android/gallery3d/ui/AlbumSlotRenderer.java | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/com/android/gallery3d/ui/AlbumSlotRenderer.java b/src/com/android/gallery3d/ui/AlbumSlotRenderer.java index 7f97693e3..dc6c89b0e 100644 --- a/src/com/android/gallery3d/ui/AlbumSlotRenderer.java +++ b/src/com/android/gallery3d/ui/AlbumSlotRenderer.java @@ -125,9 +125,6 @@ public class AlbumSlotRenderer extends AbstractSlotRenderer { if (entry.mediaType == MediaObject.MEDIA_TYPE_VIDEO) { drawVideoOverlay(canvas, width, height); - } else if ((entry.mediaType == MediaObject.MEDIA_TYPE_DRM_VIDEO) - || (entry.mediaType == MediaObject.MEDIA_TYPE_DRM_IMAGE)) { - drawDrmOverlay(canvas, width, height, entry.mediaType); } if (entry.isPanorama) { |