diff options
Diffstat (limited to 'src/com/android/camera/CameraActivity.java')
| -rw-r--r-- | src/com/android/camera/CameraActivity.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index 268535747..fffd016fe 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -200,7 +200,7 @@ public class CameraActivity extends Activity private WideAnglePanoramaModule mPanoModule; private CaptureModule mCaptureModule; private FrameLayout mAboveFilmstripControlLayout; - private FrameLayout mCameraRootFrame; + private CameraRootFrame mCameraRootFrame; private View mCameraPhotoModuleRootView; private View mCameraVideoModuleRootView; private View mCameraPanoModuleRootView; @@ -1497,7 +1497,7 @@ public class CameraActivity extends Activity LayoutInflater inflater = getLayoutInflater(); View rootLayout = inflater.inflate(R.layout.camera, null, false); - mCameraRootFrame = (FrameLayout)rootLayout.findViewById(R.id.camera_root_frame); + mCameraRootFrame = (CameraRootFrame)rootLayout.findViewById(R.id.camera_root_frame); mCameraPhotoModuleRootView = rootLayout.findViewById(R.id.camera_photo_root); mCameraVideoModuleRootView = rootLayout.findViewById(R.id.camera_video_root); mCameraPanoModuleRootView = rootLayout.findViewById(R.id.camera_pano_root); |