summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d/ui/PhotoView.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/android/gallery3d/ui/PhotoView.java')
-rw-r--r--src/com/android/gallery3d/ui/PhotoView.java11
1 files changed, 2 insertions, 9 deletions
diff --git a/src/com/android/gallery3d/ui/PhotoView.java b/src/com/android/gallery3d/ui/PhotoView.java
index 54ee07f24..303d302d2 100644
--- a/src/com/android/gallery3d/ui/PhotoView.java
+++ b/src/com/android/gallery3d/ui/PhotoView.java
@@ -79,9 +79,6 @@ public class PhotoView extends GLView {
// Returns true if the item is the Panorama.
public boolean isPanorama(int offset);
- // Returns true if the item uses a special panorama viewer
- public boolean usePanoramaViewer(int offset);
-
// Returns true if the item is a static image that represents camera
// preview.
public boolean isStaticCamera(int offset);
@@ -572,7 +569,6 @@ public class PhotoView extends GLView {
private int mRotation;
private boolean mIsCamera;
private boolean mIsPanorama;
- private boolean mUsePanoramaViewer;
private boolean mIsStaticCamera;
private boolean mIsVideo;
private boolean mIsDeletable;
@@ -586,7 +582,6 @@ public class PhotoView extends GLView {
mIsCamera = mModel.isCamera(0);
mIsPanorama = mModel.isPanorama(0);
- mUsePanoramaViewer = mModel.usePanoramaViewer(0);
mIsStaticCamera = mModel.isStaticCamera(0);
mIsVideo = mModel.isVideo(0);
mIsDeletable = mModel.isDeletable(0);
@@ -715,7 +710,7 @@ public class PhotoView extends GLView {
// Draw the play video icon and the message.
canvas.translate((int) (cx + 0.5f), (int) (cy + 0.5f));
int s = (int) (scale * Math.min(r.width(), r.height()) + 0.5f);
- if (mIsVideo || mUsePanoramaViewer) drawVideoPlayIcon(canvas, s);
+ if (mIsVideo) drawVideoPlayIcon(canvas, s);
if (mLoadingState == Model.LOADING_FAIL) {
drawLoadingFailMessage(canvas);
}
@@ -757,7 +752,6 @@ public class PhotoView extends GLView {
private ScreenNail mScreenNail;
private boolean mIsCamera;
private boolean mIsPanorama;
- private boolean mUsePanoramaViewer;
private boolean mIsStaticCamera;
private boolean mIsVideo;
private boolean mIsDeletable;
@@ -772,7 +766,6 @@ public class PhotoView extends GLView {
public void reload() {
mIsCamera = mModel.isCamera(mIndex);
mIsPanorama = mModel.isPanorama(mIndex);
- mUsePanoramaViewer = mModel.usePanoramaViewer(mIndex);
mIsStaticCamera = mModel.isStaticCamera(mIndex);
mIsVideo = mModel.isVideo(mIndex);
mIsDeletable = mModel.isDeletable(mIndex);
@@ -838,7 +831,7 @@ public class PhotoView extends GLView {
invalidate();
}
int s = Math.min(drawW, drawH);
- if (mIsVideo || mUsePanoramaViewer) drawVideoPlayIcon(canvas, s);
+ if (mIsVideo) drawVideoPlayIcon(canvas, s);
if (mLoadingState == Model.LOADING_FAIL) {
drawLoadingFailMessage(canvas);
}