From f29da1211f7814a59b1ef648274478125ce23c8d Mon Sep 17 00:00:00 2001 From: Danny Baumann Date: Wed, 30 Nov 2016 09:20:26 +0100 Subject: Modernize look of review controls. Change-Id: I79f74502364a523a7c9c9f8ae3c63c3fcfebac3d --- src/com/android/camera/PhotoUI.java | 5 +++-- src/com/android/camera/VideoUI.java | 6 ++++-- 2 files changed, 7 insertions(+), 4 deletions(-) (limited to 'src/com') diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java index a4241b515..a6d806f8f 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 fc4243457..029dda9f5 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. -- cgit v1.2.3