summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/PhotoUI.java
diff options
context:
space:
mode:
authorDoris Liu <tianliu@google.com>2013-04-11 17:07:25 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-04-11 17:07:26 +0000
commit7c6140adb4ea219da3a45f5d69daae3f4340593a (patch)
tree51a323e1134fd0affa3095325eaed04b9a74fc24 /src/com/android/camera/PhotoUI.java
parentf37454e2ec94f83bc52177b9c986935006619b75 (diff)
parent28dc7f348b70ee6735d208b48ca12a94e9cd222f (diff)
downloadandroid_packages_apps_Snap-7c6140adb4ea219da3a45f5d69daae3f4340593a.tar.gz
android_packages_apps_Snap-7c6140adb4ea219da3a45f5d69daae3f4340593a.tar.bz2
android_packages_apps_Snap-7c6140adb4ea219da3a45f5d69daae3f4340593a.zip
Merge "Fix camera preview being squished" into gb-ub-photos-bryce
Diffstat (limited to 'src/com/android/camera/PhotoUI.java')
-rw-r--r--src/com/android/camera/PhotoUI.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java
index 29ebd6a70..53fdc969e 100644
--- a/src/com/android/camera/PhotoUI.java
+++ b/src/com/android/camera/PhotoUI.java
@@ -144,7 +144,6 @@ public class PhotoUI implements PieListener,
}
}
- mRootView.addOnLayoutChangeListener(mLayoutListener);
}
public View getRootView() {
@@ -259,6 +258,7 @@ public class PhotoUI implements PieListener,
mShutterButton.setImageResource(R.drawable.btn_new_shutter);
mShutterButton.setOnShutterButtonListener(mController);
mShutterButton.setVisibility(View.VISIBLE);
+ mRootView.addOnLayoutChangeListener(mLayoutListener);
}
// called from onResume every other time
@@ -270,6 +270,7 @@ public class PhotoUI implements PieListener,
if (mMenu != null) {
mMenu.reloadPreferences();
}
+ mRootView.addOnLayoutChangeListener(mLayoutListener);
}
public void initializeZoom(Camera.Parameters params) {