Merge branch 'cm-12.1' of git://github.com/CyanogenMod/android_packages_apps_Gallery2 into cm-13.0

Change-Id: Ib8caa024d2e6feca332e3645038f226fd5a910a2

1 files changed, 16 insertions, 0 deletions

diff --git a/src/com/android/gallery3d/ui/AbstractSlotRenderer.java b/src/com/android/gallery3d/ui/AbstractSlotRenderer.java
index 729439dc3..63bcbea5d 100644
--- a/src/com/android/gallery3d/ui/AbstractSlotRenderer.java
+++ b/src/com/android/gallery3d/ui/AbstractSlotRenderer.java
@@ -20,6 +20,7 @@ import android.content.Context;
 import android.graphics.Rect;
 
 import com.android.gallery3d.R;
+import com.android.gallery3d.data.MediaObject;
 import com.android.gallery3d.glrenderer.FadeOutTexture;
 import com.android.gallery3d.glrenderer.GLCanvas;
 import com.android.gallery3d.glrenderer.NinePatchTexture;
@@ -33,6 +34,7 @@ public abstract class AbstractSlotRenderer implements SlotView.SlotRenderer {
     private final ResourceTexture mPanoramaIcon;
     private final NinePatchTexture mFramePressed;
     private final NinePatchTexture mFrameSelected;
+    private final ResourceTexture mDrmIcon;
     private FadeOutTexture mFramePressedUp;
 
     protected AbstractSlotRenderer(Context context) {
@@ -41,6 +43,7 @@ public abstract class AbstractSlotRenderer implements SlotView.SlotRenderer {
         mPanoramaIcon = new ResourceTexture(context, R.drawable.ic_360pano_holo_light);
         mFramePressed = new NinePatchTexture(context, R.drawable.grid_pressed);
         mFrameSelected = new NinePatchTexture(context, R.drawable.grid_selected);
+        mDrmIcon = new ResourceTexture(context, R.drawable.drm_image);
     }
 
     protected void drawContent(GLCanvas canvas,
@@ -79,6 +82,19 @@ public abstract class AbstractSlotRenderer implements SlotView.SlotRenderer {
         mVideoPlayIcon.draw(canvas, (width - s) / 2, (height - s) / 2, s, s);
     }
 
+    protected void drawDrmOverlay(GLCanvas canvas, int width, int height, int Drm_mediaType) {
+        // Scale the video overlay to the height of the thumbnail and put it on the left side.
+        if (Drm_mediaType == MediaObject.MEDIA_TYPE_DRM_VIDEO) {
+            ResourceTexture v = mVideoOverlay;
+            float scale = (float) height / v.getHeight();
+            int w = Math.round(scale * v.getWidth());
+            int h = Math.round(scale * v.getHeight());
+            v.draw(canvas, 0, 0, w, h);
+        }
+        int side = Math.min(width, height) / 6;
+        mDrmIcon.draw(canvas, (width - side) / 2, (height - side) / 2, side, side);
+    }
+
     protected void drawPanoramaIcon(GLCanvas canvas, int width, int height) {
         int iconSize = Math.min(width, height) / 6;
         mPanoramaIcon.draw(canvas, (width - iconSize) / 2, (height - iconSize) / 2,