diff options
Diffstat (limited to 'src/com/android/gallery3d/ui/PhotoView.java')
-rwxr-xr-x | src/com/android/gallery3d/ui/PhotoView.java | 28 |
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; |