summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/com/android/camera/PhotoUI.java5
-rw-r--r--src/com/android/camera/VideoUI.java6
2 files changed, 7 insertions, 4 deletions
diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java
index a4241b5..a6d806f 100644
--- a/src/com/android/camera/PhotoUI.java
+++ b/src/com/android/camera/PhotoUI.java
@@ -528,8 +528,9 @@ public class PhotoUI extends BaseUI implements PieListener,
if (mController.isImageCaptureIntent()) {
mCameraControls.hideRemainingPhotoCnt();
mCameraControls.hideSwitcher();
- ViewGroup cameraControls = (ViewGroup) mRootView.findViewById(R.id.camera_controls);
- mActivity.getLayoutInflater().inflate(R.layout.review_module_control, cameraControls);
+
+ ViewStub reviewStub = (ViewStub) mRootView.findViewById(R.id.review_control_stub);
+ reviewStub.inflate();
mReviewDoneButton = mRootView.findViewById(R.id.btn_done);
mReviewCancelButton = mRootView.findViewById(R.id.btn_cancel);
diff --git a/src/com/android/camera/VideoUI.java b/src/com/android/camera/VideoUI.java
index fc42434..029dda9 100644
--- a/src/com/android/camera/VideoUI.java
+++ b/src/com/android/camera/VideoUI.java
@@ -261,8 +261,10 @@ public class VideoUI extends BaseUI implements PieRenderer.PieListener,
if (mController.isVideoCaptureIntent()) {
hideSwitcher();
- mActivity.getLayoutInflater().inflate(R.layout.review_module_control,
- (ViewGroup) mCameraControls);
+
+ ViewStub reviewStub = (ViewStub) mRootView.findViewById(R.id.review_control_stub);
+ reviewStub.inflate();
+
// Cannot use RotateImageView for "done" and "cancel" button because
// the tablet layout uses RotateLayout, which cannot be cast to
// RotateImageView.