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

1 files changed, 0 insertions, 28 deletions

diff --git a/src/com/android/gallery3d/ui/PhotoView.java b/src/com/android/gallery3d/ui/PhotoView.java
index 265a53fc7..347d4b3af 100755
--- a/src/com/android/gallery3d/ui/PhotoView.java
+++ b/src/com/android/gallery3d/ui/PhotoView.java
@@ -18,7 +18,6 @@ package com.android.gallery3d.ui;
 
 import android.content.Context;
 import android.content.res.Configuration;
-import android.drm.DrmHelper;
 import android.graphics.Color;
 import android.graphics.Matrix;
 import android.graphics.Rect;
@@ -204,7 +203,6 @@ public class PhotoView extends GLView {
     private EdgeView mEdgeView;
     private UndoBarView mUndoBar;
     private Texture mVideoPlayIcon;
-    private Texture mDrmIcon;
 
     private SynchronizedHandler mHandler;
 
@@ -308,7 +306,6 @@ public class PhotoView extends GLView {
             }
         });
         mVideoPlayIcon = new ResourceTexture(mContext, R.drawable.ic_control_play);
-        mDrmIcon = new ResourceTexture(mContext, R.drawable.drm_image);
         for (int i = -SCREEN_NAIL_MAX; i <= SCREEN_NAIL_MAX; i++) {
             if (i == 0) {
                 mPictures.put(i, new FullPicture());
@@ -743,15 +740,6 @@ public class PhotoView extends GLView {
                 drawLoadingFailMessage(canvas);
             }
 
-            if (getFilmMode()) {
-                MediaItem item = mModel.getMediaItem(0);
-                if (item != null) {
-                    if (DrmHelper.isDrmFile(item.getFilePath())) {
-                        drawDrmIcon(canvas, s);
-                    }
-                }
-            }
-
             // Draw a debug indicator showing which picture has focus (index ==
             // 0).
             //canvas.fillRect(-10, -10, 20, 20, 0x80FF00FF);
@@ -869,18 +857,9 @@ public class PhotoView extends GLView {
             if (mModel.isVideo(mIndex) || mModel.isGif(mIndex)) {
                 drawVideoPlayIcon(canvas, s);
             }
-
             if (mLoadingState == Model.LOADING_FAIL ) {
                 drawLoadingFailMessage(canvas);
             }
-
-            MediaItem item = mModel.getMediaItem(mIndex);
-            if (item != null) {
-                if (DrmHelper.isDrmFile(item.getFilePath())) {
-                    drawDrmIcon(canvas, s);
-                }
-            }
-
             canvas.restore();
         }
 
@@ -947,13 +926,6 @@ public class PhotoView extends GLView {
         mVideoPlayIcon.draw(canvas, -s / 2, -s / 2, s, s);
     }
 
-    // Draw the Drm lock icon (in the place where the spinner was)
-    private void drawDrmIcon(GLCanvas canvas, int side) {
-        int s = side / ICON_RATIO;
-        // Draw the Drm lock icon at the center
-        mDrmIcon.draw(canvas, -s / 2, -s / 2, s, s);
-    }
-
     // Draw the "no thumbnail" message
     private void drawLoadingFailMessage(GLCanvas canvas) {
         StringTexture m = mNoThumbnailText;