Defer bitmap rotation until it's drawn on ImageView.

2 files changed, 11 insertions, 2 deletions

diff --git a/tests/src/com/android/camera/BitmapManagerUnitTests.java b/tests/src/com/android/camera/BitmapManagerUnitTests.java
index 1e6300e..4ac8b1f 100644
--- a/tests/src/com/android/camera/BitmapManagerUnitTests.java
+++ b/tests/src/com/android/camera/BitmapManagerUnitTests.java
@@ -40,7 +40,7 @@ public class BitmapManagerUnitTests extends AndroidTestCase {
 
         @Override
         public void run() {
-            bitmap = mImage.thumbBitmap();
+            bitmap = mImage.thumbBitmap(IImage.ROTATE_AS_NEEDED);
         }
 
         public Bitmap getBitmap() {
diff --git a/tests/src/com/android/camera/gallery/MockImage.java b/tests/src/com/android/camera/gallery/MockImage.java
index 97d51b6..ad68e55 100644
--- a/tests/src/com/android/camera/gallery/MockImage.java
+++ b/tests/src/com/android/camera/gallery/MockImage.java
@@ -16,6 +16,10 @@ public class MockImage implements IImage {
         mTakenDate = takenDate;
     }
 
+    public int getDegreesRotated() {
+        return 0;
+    }
+
     protected void setContainer(IImageList container) {
         this.mContainer = container;
     }
@@ -25,6 +29,11 @@ public class MockImage implements IImage {
     }
 
     public Bitmap fullSizeBitmap(int minSideLength, int maxNumberOfPixels,
+            boolean rotateAsNeeded) {
+        return null;
+    }
+
+    public Bitmap fullSizeBitmap(int minSideLength, int maxNumberOfPixels,
             boolean rotateAsNeeded, boolean useNative) {
         return null;
     }
@@ -92,7 +101,7 @@ public class MockImage implements IImage {
     public void setTitle(String name) {
     }
 
-    public Bitmap thumbBitmap() {
+    public Bitmap thumbBitmap(boolean rotateAsNeeded) {
         return null;
     }