summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2012-12-10 13:25:49 -0800
committerJohn Reck <jreck@google.com>2012-12-10 13:25:49 -0800
commitfdc55e32bb4643ca7a3637045b975d94b25f3714 (patch)
tree3381965b5c9e6a85e6b2cdf36b8fc151b9a2543a
parent6004b5721a9e3d310be4d0f5fac92e14d54231d1 (diff)
downloadandroid_packages_apps_Snap-fdc55e32bb4643ca7a3637045b975d94b25f3714.tar.gz
android_packages_apps_Snap-fdc55e32bb4643ca7a3637045b975d94b25f3714.tar.bz2
android_packages_apps_Snap-fdc55e32bb4643ca7a3637045b975d94b25f3714.zip
Force a layout pass if the display rotation changes
Bug: 7687209 DisplayRotation is used to map camera orientation to the display and is updated in layoutContentPane(). However, in the case of a 180 rotate framework doesn't send an onConfigurationChanged nor does the layout dimensions change, thus layoutContentPane doesn't fire and we don't update mDisplayRotation, resulting in an upside-down preview. To handle this, check each draw whether or not the display rotation has changed and if it has force a layout pass. Change-Id: I610ea235d1bf7de2743f4cdb8e42ba1ddcb41404
-rw-r--r--src/com/android/gallery3d/ui/GLRootView.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/ui/GLRootView.java b/src/com/android/gallery3d/ui/GLRootView.java
index ea457f7fa..b7c48bf2e 100644
--- a/src/com/android/gallery3d/ui/GLRootView.java
+++ b/src/com/android/gallery3d/ui/GLRootView.java
@@ -392,7 +392,11 @@ public class GLRootView extends GLSurfaceView
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);