summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDoris Liu <tianliu@google.com>2013-04-26 16:50:54 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-04-26 16:50:54 +0000
commit2b26ee170c6bc846530bcec2a768891843a0ab9d (patch)
tree98c42548df6d53704be26de39132b19b320cb4f3 /src
parent65a6fa8dca42b855efcfde4f8660d574b4c05e1f (diff)
parentee62d817e50baf404339510105f04cbc6d984210 (diff)
downloadandroid_packages_apps_Snap-2b26ee170c6bc846530bcec2a768891843a0ab9d.tar.gz
android_packages_apps_Snap-2b26ee170c6bc846530bcec2a768891843a0ab9d.tar.bz2
android_packages_apps_Snap-2b26ee170c6bc846530bcec2a768891843a0ab9d.zip
Merge "Make sure the initial rotation is set" into gb-ub-photos-bryce
Diffstat (limited to 'src')
-rw-r--r--src/com/android/camera/ui/RotatableLayout.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/camera/ui/RotatableLayout.java b/src/com/android/camera/ui/RotatableLayout.java
index bf8060528..2dea58d9d 100644
--- a/src/com/android/camera/ui/RotatableLayout.java
+++ b/src/com/android/camera/ui/RotatableLayout.java
@@ -62,6 +62,7 @@ public class RotatableLayout extends FrameLayout {
@Override
public void onAttachedToWindow() {
+ mPrevRotation = Util.getDisplayRotation((Activity) getContext());
// check if there is any rotation before the view is attached to window
int currentOrientation = getResources().getConfiguration().orientation;
if (mInitialOrientation == currentOrientation) {
@@ -74,7 +75,6 @@ public class RotatableLayout extends FrameLayout {
&& currentOrientation == Configuration.ORIENTATION_LANDSCAPE) {
rotateLayout(false);
}
- mPrevRotation = Util.getDisplayRotation((Activity) getContext());
}
@Override