diff options
Diffstat (limited to 'src/com/android/camera/CameraActivity.java')
| -rw-r--r-- | src/com/android/camera/CameraActivity.java | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index 6a3bddbd2..bdb03bb0a 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -1944,10 +1944,7 @@ public class CameraActivity extends Activity mCameraPhotoModuleRootView.setVisibility(View.GONE); mCameraVideoModuleRootView.setVisibility(View.GONE); mCameraPanoModuleRootView.setVisibility(View.GONE); - mCameraRootFrame.removeAllViews(); mCurrentModuleIndex = moduleIndex; - - final CameraRootView rootView; switch (moduleIndex) { case ModuleSwitcher.VIDEO_MODULE_INDEX: if (mVideoModule == null) { @@ -1955,7 +1952,7 @@ public class CameraActivity extends Activity mVideoModule.init(this, mCameraVideoModuleRootView); } mCurrentModule = mVideoModule; - rootView = mCameraVideoModuleRootView; + mCameraVideoModuleRootView.setVisibility(View.VISIBLE); break; case ModuleSwitcher.WIDE_ANGLE_PANO_MODULE_INDEX: @@ -1964,7 +1961,7 @@ public class CameraActivity extends Activity mPanoModule.init(this, mCameraPanoModuleRootView); } mCurrentModule = mPanoModule; - rootView = mCameraPanoModuleRootView; + mCameraPanoModuleRootView.setVisibility(View.VISIBLE); break; case ModuleSwitcher.PHOTO_MODULE_INDEX: @@ -1976,11 +1973,9 @@ public class CameraActivity extends Activity mPhotoModule.init(this, mCameraPhotoModuleRootView); } mCurrentModule = mPhotoModule; - rootView = mCameraPhotoModuleRootView; + mCameraPhotoModuleRootView.setVisibility(View.VISIBLE); break; } - mCameraRootFrame.addView(rootView); - rootView.setVisibility(View.VISIBLE); // Re-apply the last fitSystemWindows() run. Our views rely on this, but // the framework's ActionBarOverlayLayout effectively prevents this if the |