summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/CaptureUI.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/android/camera/CaptureUI.java')
-rw-r--r--src/com/android/camera/CaptureUI.java104
1 files changed, 14 insertions, 90 deletions
diff --git a/src/com/android/camera/CaptureUI.java b/src/com/android/camera/CaptureUI.java
index fac8c5b1e..afebab705 100644
--- a/src/com/android/camera/CaptureUI.java
+++ b/src/com/android/camera/CaptureUI.java
@@ -136,8 +136,6 @@ public class CaptureUI extends BaseUI implements PreviewGestures.SingleTapListen
SettingsManager.KEY_AUTO_VIDEOSNAP_SIZE
};
private final FocusRing mFocusRing;
- private CameraActivity mActivity;
- private View mRootView;
private CaptureModule mModule;
private AutoFitSurfaceView mSurfaceView;
private AutoFitSurfaceView mSurfaceViewMono;
@@ -209,18 +207,13 @@ public class CaptureUI extends BaseUI implements PreviewGestures.SingleTapListen
private ImageView mVideoButton;
private RenderOverlay mRenderOverlay;
private View mMenuButton;
- private ModuleSwitcher mSwitcher;
private CountDownView mCountDownView;
- private CameraControls mCameraControls;
private PieRenderer mPieRenderer;
private ZoomRenderer mZoomRenderer;
private Allocation mMonoDummyAllocation;
private Allocation mMonoDummyOutputAllocation;
private boolean mIsMonoDummyAllocationEverUsed = false;
- private int mScreenRatio = CameraUtil.RATIO_UNKNOWN;
- private int mTopMargin = 0;
- private int mBottomMargin = 0;
private LinearLayout mSceneAndFilterLayout;
private int mSceneAndFilterMenuSize;
@@ -256,15 +249,12 @@ public class CaptureUI extends BaseUI implements PreviewGestures.SingleTapListen
return mDisplaySize;
}
- public CaptureUI(CameraActivity activity, CaptureModule module, View parent) {
- mActivity = activity;
+ public CaptureUI(CameraActivity activity, CaptureModule module, ViewGroup parent) {
+ super(activity, parent, R.layout.capture_module);
mModule = module;
- mRootView = parent;
mSettingsManager = activity.getSettingsManager();
mSettingsManager.registerListener(this);
- mActivity.getLayoutInflater().inflate(R.layout.capture_module,
- (ViewGroup) mRootView, true);
- mPreviewCover = mRootView.findViewById(R.id.preview_cover);
+
// display the view
mSurfaceView = (AutoFitSurfaceView) mRootView.findViewById(R.id.mdp_preview_content);
mSurfaceHolder = mSurfaceView.getHolder();
@@ -308,19 +298,6 @@ public class CaptureUI extends BaseUI implements PreviewGestures.SingleTapListen
mTrackingFocusRenderer.setVisible(false);
}
- mSwitcher = (ModuleSwitcher) mRootView.findViewById(R.id.camera_switcher);
- mSwitcher.setCurrentIndex(ModuleSwitcher.PHOTO_MODULE_INDEX);
- mSwitcher.setSwitchListener(mActivity);
- mSwitcher.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- if (mModule.getCameraState() == PhotoController.LONGSHOT) {
- return;
- }
- mSwitcher.showPopup();
- mSwitcher.setOrientation(mOrientation, false);
- }
- });
mMenuButton = mRootView.findViewById(R.id.menu);
mRecordingTimeView = (TextView) mRootView.findViewById(R.id.recording_time);
@@ -352,20 +329,8 @@ public class CaptureUI extends BaseUI implements PreviewGestures.SingleTapListen
RotateImageView muteButton = (RotateImageView) mRootView.findViewById(R.id.mute_button);
muteButton.setVisibility(View.GONE);
- mCameraControls = (CameraControls) mRootView.findViewById(R.id.camera_controls);
mFaceView = (Camera2FaceView) mRootView.findViewById(R.id.face_view);
- mActivity.getWindowManager().getDefaultDisplay().getSize(mDisplaySize);
- mScreenRatio = CameraUtil.determineRatio(mDisplaySize.x, mDisplaySize.y);
- if (mScreenRatio == CameraUtil.RATIO_16_9) {
- int l = mDisplaySize.x > mDisplaySize.y ? mDisplaySize.x : mDisplaySize.y;
- int tm = mActivity.getResources().getDimensionPixelSize(R.dimen.preview_top_margin);
- int bm = mActivity.getResources().getDimensionPixelSize(R.dimen.preview_bottom_margin);
- mTopMargin = l / 4 * tm / (tm + bm);
- mBottomMargin = l / 4 - mTopMargin;
- }
- mCameraControls.setMargins(mTopMargin, mBottomMargin);
-
if (mPieRenderer == null) {
mPieRenderer = new PieRenderer(mActivity);
mRenderOverlay.addRenderer(mPieRenderer);
@@ -420,15 +385,8 @@ public class CaptureUI extends BaseUI implements PreviewGestures.SingleTapListen
// called from onResume but only the first time
public void initializeFirstTime() {
// Initialize shutter button.
- mShutterButton.setImageResource(R.drawable.shutter_button_anim);
- mShutterButton.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- if (!isCameraControlsAnimating())
- doShutterAnimation();
- }
- });
- mShutterButton.setOnShutterButtonListener(mModule);
+ mShutterButton.setImageResource(R.drawable.btn_new_shutter);
+ mShutterButton.addOnShutterButtonListener(mModule);
mShutterButton.setVisibility(View.VISIBLE);
mVideoButton.setVisibility(View.VISIBLE);
mVideoButton.setOnClickListener(new View.OnClickListener() {
@@ -581,19 +539,6 @@ public class CaptureUI extends BaseUI implements PreviewGestures.SingleTapListen
mSceneModeSwitcher.setVisibility(View.VISIBLE);
}
- public void hideSwitcher() {
- mSwitcher.closePopup();
- mSwitcher.setVisibility(View.INVISIBLE);
- }
-
- public void showSwitcher() {
- mSwitcher.setVisibility(View.VISIBLE);
- }
-
- public void setSwitcherIndex() {
- mSwitcher.setCurrentIndex(ModuleSwitcher.PHOTO_MODULE_INDEX);
- }
-
public void addSceneMode() {
String value = mSettingsManager.getValue(SettingsManager.KEY_SCENE_MODE);
if (value == null) return;
@@ -1167,7 +1112,11 @@ public class CaptureUI extends BaseUI implements PreviewGestures.SingleTapListen
if (mFrontBackSwitcher != null) mFrontBackSwitcher.setVisibility(status);
if (mSceneModeSwitcher != null) mSceneModeSwitcher.setVisibility(status);
if (mFilterModeSwitcher != null) mFilterModeSwitcher.setVisibility(status);
- if (mSwitcher != null) mSwitcher.setVisibility(status);
+ if (hide) {
+ mCameraControls.hideSwitcher();
+ } else {
+ mCameraControls.showSwitcher();
+ }
}
public boolean isCameraControlsAnimating() {
@@ -1193,27 +1142,6 @@ public class CaptureUI extends BaseUI implements PreviewGestures.SingleTapListen
});
}
- public void doShutterAnimation() {
- AnimationDrawable frameAnimation = (AnimationDrawable) mShutterButton.getDrawable();
- frameAnimation.stop();
- frameAnimation.start();
- }
-
- public void showUI() {
- if (!mUIhidden || isMenuBeingShown())
- return;
- mUIhidden = false;
- mCameraControls.showUI();
- }
-
- public void hideUI() {
- mSwitcher.closePopup();
- if (mUIhidden)
- return;
- mUIhidden = true;
- mCameraControls.hideUI();
- }
-
public void cleanUpMenus() {
showUI();
mActivity.setSystemBarsVisibility(false);
@@ -1307,12 +1235,8 @@ public class CaptureUI extends BaseUI implements PreviewGestures.SingleTapListen
// ignore backs while we're taking a picture
return true;
}
- if (mSwitcher != null && mSwitcher.showsPopup()) {
- mSwitcher.closePopup();
- return true;
- } else {
- return false;
- }
+ mCameraControls.collapse();
+ return false;
}
public SurfaceHolder getSurfaceHolder() {
@@ -1420,7 +1344,7 @@ public class CaptureUI extends BaseUI implements PreviewGestures.SingleTapListen
}
public boolean collapseCameraControls() {
- mSwitcher.closePopup();
+ mCameraControls.collapse();
// Remove all the popups/dialog boxes
boolean ret = false;
removeAllMenu();
@@ -1535,7 +1459,7 @@ public class CaptureUI extends BaseUI implements PreviewGestures.SingleTapListen
if (previewFocused) {
showUI();
} else {
- hideUI();
+ hideUI(true);
}
if (mFaceView != null) {
mFaceView.setBlockDraw(!previewFocused);
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-26 10:57:19 +0000