Merge "Remove display change listener for mode switch" into gb-ub-photos-carlsbad

1 files changed, 8 insertions, 1 deletions

diff --git a/src/com/android/camera/VideoUI.java b/src/com/android/camera/VideoUI.java
index bdfdc0dd3..f097d9344 100644
--- a/src/com/android/camera/VideoUI.java
+++ b/src/com/android/camera/VideoUI.java
@@ -171,7 +171,6 @@ public class VideoUI implements PieRenderer.PieListener,
         mTextureView = (TextureView) mRootView.findViewById(R.id.preview_content);
         mTextureView.setSurfaceTextureListener(this);
         mTextureView.addOnLayoutChangeListener(mLayoutListener);
-        ((CameraRootView) mRootView).setDisplayChangeListener(this);
         mFlashOverlay = mRootView.findViewById(R.id.flash_overlay);
         mShutterButton = (ShutterButton) mRootView.findViewById(R.id.shutter_button);
         mSwitcher = (ModuleSwitcher) mRootView.findViewById(R.id.camera_switcher);
@@ -381,6 +380,14 @@ public class VideoUI implements PieRenderer.PieListener,
         }
     }
 
+    public void initDisplayChangeListener() {
+        ((CameraRootView) mRootView).setDisplayChangeListener(this);
+    }
+
+    public void removeDisplayChangeListener() {
+        ((CameraRootView) mRootView).removeDisplayChangeListener();
+    }
+
     public void overrideSettings(final String... keyvalues) {
         mVideoMenu.overrideSettings(keyvalues);
     }