Fix 5224359: query width and height from media provider.

Change-Id: Ib7a560822a1d1fdc2be8c572d4d9319f908f7c16

diff --git a/src/com/android/gallery3d/data/LocalImage.java b/src/com/android/gallery3d/data/LocalImage.java
index ca87b94..e70b2ee 100644 (file)
--- a/src/com/android/gallery3d/data/LocalImage.java
+++ b/src/com/android/gallery3d/data/LocalImage.java
@@ -61,6 +61,8 @@ public class LocalImage extends LocalMediaItem {
     private static final int INDEX_ORIENTATION = 9;
     private static final int INDEX_BUCKET_ID = 10;
     private static final int INDEX_SIZE_ID = 11;
+    private static final int INDEX_WIDTH = 12;
+    private static final int INDEX_HEIGHT = 13;
 
     static final String[] PROJECTION =  {
             ImageColumns._ID,           // 0
@@ -74,12 +76,17 @@ public class LocalImage extends LocalMediaItem {
             ImageColumns.DATA,          // 8
             ImageColumns.ORIENTATION,   // 9
             ImageColumns.BUCKET_ID,     // 10
-            ImageColumns.SIZE           // 11
+            ImageColumns.SIZE,          // 11
+            // These should be changed to proper names after they are made public.
+            "width", // ImageColumns.WIDTH,         // 12
+            "height", // ImageColumns.HEIGHT         // 13
     };
 
     private final GalleryApp mApplication;
 
     public int rotation;
+    public int width;
+    public int height;
 
     public LocalImage(Path path, GalleryApp application, Cursor cursor) {
         super(path, nextVersionNumber());
@@ -118,6 +125,8 @@ public class LocalImage extends LocalMediaItem {
         rotation = cursor.getInt(INDEX_ORIENTATION);
         bucketId = cursor.getInt(INDEX_BUCKET_ID);
         fileSize = cursor.getLong(INDEX_SIZE_ID);
+        width = cursor.getInt(INDEX_WIDTH);
+        height = cursor.getInt(INDEX_HEIGHT);
     }
 
     @Override
@@ -138,6 +147,8 @@ public class LocalImage extends LocalMediaItem {
         rotation = uh.update(rotation, cursor.getInt(INDEX_ORIENTATION));
         bucketId = uh.update(bucketId, cursor.getInt(INDEX_BUCKET_ID));
         fileSize = uh.update(fileSize, cursor.getLong(INDEX_SIZE_ID));
+        width = uh.update(width, cursor.getInt(INDEX_WIDTH));
+        height = uh.update(height, cursor.getInt(INDEX_HEIGHT));
         return uh.isUpdated();
     }
 
@@ -309,13 +320,11 @@ public class LocalImage extends LocalMediaItem {
 
     @Override
     public int getWidth() {
-        // TODO
-        return 0;
+        return width;
     }
 
     @Override
     public int getHeight() {
-        // TODO
-        return 0;
+        return height;
     }
 }

diff --git a/src/com/android/gallery3d/data/LocalVideo.java b/src/com/android/gallery3d/data/LocalVideo.java
index 785bed1..111a5f1 100644 (file)
--- a/src/com/android/gallery3d/data/LocalVideo.java
+++ b/src/com/android/gallery3d/data/LocalVideo.java
@@ -213,13 +213,11 @@ public class LocalVideo extends LocalMediaItem {
 
     @Override
     public int getWidth() {
-        // TODO
         return 0;
     }
 
     @Override
     public int getHeight() {
-        // TODO
         return 0;
     }
 }