Gallery2: Upgrade works

Make it work on the new platform

Change-Id: I2d019f21bcb6da4e26fb671f23c5e1cef574bcd5

1 files changed, 27 insertions, 27 deletions

diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java
index 65c26278a..9f3b85f10 100755..100644
--- a/src/com/android/gallery3d/app/PhotoPage.java
+++ b/src/com/android/gallery3d/app/PhotoPage.java
@@ -24,7 +24,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.res.Configuration;
-import android.drm.DrmHelper;
+//import android.drm.DrmHelper;
 import android.graphics.Rect;
 import android.media.MediaFile;
 import android.net.Uri;
@@ -811,13 +811,13 @@ public abstract class PhotoPage extends ActivityState implements
             // Do not consume rights of a GIF image and video here.
             // ViewGifImage will take care of GIF rights consumption stub.
             // MediaPlayer will handle the video rights consumption stub.
-            String mime = mCurrentPhoto.getMimeType();
-            if (!TextUtils.isEmpty(mime) && !mime.equals("image/gif")
-                    && !mime.startsWith("video/")) {
-                DrmHelper.manageDrmLicense(mActivity.getAndroidContext(),
-                        mHandler, mCurrentPhoto.getFilePath(),
-                        mCurrentPhoto.getMimeType());
-            }
+//            String mime = mCurrentPhoto.getMimeType();
+//            if (!TextUtils.isEmpty(mime) && !mime.equals("image/gif")
+//                    && !mime.startsWith("video/")) {
+//                DrmHelper.manageDrmLicense(mActivity.getAndroidContext(),
+//                        mHandler, mCurrentPhoto.getFilePath(),
+//                        mCurrentPhoto.getMimeType());
+//            }
         }
     }
 
@@ -1173,12 +1173,12 @@ public abstract class PhotoPage extends ActivityState implements
                 mSelectionManager.toggle(path);
                 mMenuExecutor.onMenuClicked(item, confirmMsg, mConfirmDialogListener);
                 return true;
-            case R.id.action_drm_info:
-                String filepath = current.getFilePath();
-                if (DrmHelper.isDrmFile(filepath)) {
-                    DrmHelper.showDrmInfo(mActivity.getAndroidContext(), filepath);
-                }
-                return true;
+//            case R.id.action_drm_info:
+//                String filepath = current.getFilePath();
+//                if (DrmHelper.isDrmFile(filepath)) {
+//                    DrmHelper.showDrmInfo(mActivity.getAndroidContext(), filepath);
+//                }
+//                return true;
             default :
                 return false;
         }
@@ -1452,16 +1452,16 @@ public abstract class PhotoPage extends ActivityState implements
             // Do not consume rights of a GIF image and video here.
             // ViewGifImage will take care of GIF rights consumption stub.
             // MediaPlayer will handle the video rights consumption stub.
-            if ((mMediaSet != null && mMediaSet.getMediaItemCount() > 1)
-                    || !(this instanceof SinglePhotoPage)) {
-                String mime = mCurrentPhoto.getMimeType();
-                if (!TextUtils.isEmpty(mime) && !mime.equals("image/gif")
-                        && !mime.startsWith("video/")) {
-                    DrmHelper.manageDrmLicense(mActivity.getAndroidContext(),
-                            mHandler, mCurrentPhoto.getFilePath(),
-                            mCurrentPhoto.getMimeType());
-                }
-            }
+//            if ((mMediaSet != null && mMediaSet.getMediaItemCount() > 1)
+//                    || !(this instanceof SinglePhotoPage)) {
+//                String mime = mCurrentPhoto.getMimeType();
+//                if (!TextUtils.isEmpty(mime) && !mime.equals("image/gif")
+//                        && !mime.startsWith("video/")) {
+//                    DrmHelper.manageDrmLicense(mActivity.getAndroidContext(),
+//                            mHandler, mCurrentPhoto.getFilePath(),
+//                            mCurrentPhoto.getMimeType());
+//                }
+//            }
         }
     }
 
@@ -1656,9 +1656,9 @@ public abstract class PhotoPage extends ActivityState implements
 
     private static void viewAnimateGif(Activity activity, Uri uri) {
         Intent intent = new Intent(ViewGifImage.VIEW_GIF_ACTION, uri);
-        if (DrmHelper.isDrmFile(uri.toString())) {
-            intent.setDataAndType(uri, "image/gif");
-        }
+//        if (DrmHelper.isDrmFile(uri.toString())) {
+//            intent.setDataAndType(uri, "image/gif");
+//        }
         activity.startActivity(intent);
     }
 }