commit 5c7b259812a4cea11e14b901526faf5a33c4c07c
author John Reck <jreck@google.com> Mon Dec 10 14:16:09 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Dec 10 14:16:09 2012 -0800
tree aab4e3e336ef9a08ccd7d28e108012e3a0ff94d1
parent c649360ce22f0138bfcb745eed585a32eb8570e7
parent 695e1aa059cbc2cb2988f6beb0fee8ff7952b229

am 695e1aa0: Force a layout pass if the display rotation changes

* commit '695e1aa059cbc2cb2988f6beb0fee8ff7952b229':
  Force a layout pass if the display rotation changes

src/com/android/gallery3d/ui/GLRootView.java

diff --git a/src/com/android/gallery3d/ui/GLRootView.java b/src/com/android/gallery3d/ui/GLRootView.java
index e2268fa..6b76999 100644
--- a/src/com/android/gallery3d/ui/GLRootView.java
+++ b/src/com/android/gallery3d/ui/GLRootView.java
@@ -394,7 +394,11 @@
 
         mRenderRequested = false;
 
-        if ((mFlags & FLAG_NEED_LAYOUT) != 0) layoutContentPane();
+        if ((mOrientationSource != null
+                && mDisplayRotation != mOrientationSource.getDisplayRotation())
+                || (mFlags & FLAG_NEED_LAYOUT) != 0) {
+            layoutContentPane();
+        }
 
         mCanvas.save(GLCanvas.SAVE_FLAG_ALL);
         rotateCanvas(-mCompensation);