diff options
Diffstat (limited to 'src/com/android/camera/CaptureUI.java')
| -rwxr-xr-x | src/com/android/camera/CaptureUI.java | 143 |
1 files changed, 13 insertions, 130 deletions
diff --git a/src/com/android/camera/CaptureUI.java b/src/com/android/camera/CaptureUI.java index ccb45e12d..12b7480d5 100755 --- a/src/com/android/camera/CaptureUI.java +++ b/src/com/android/camera/CaptureUI.java @@ -71,11 +71,10 @@ import com.android.camera.imageprocessor.filter.DeepPortraitFilter; import com.android.camera.ui.AutoFitSurfaceView; import com.android.camera.ui.Camera2FaceView; import com.android.camera.ui.CameraControls; -import com.android.camera.ui.MenuHelp; import com.android.camera.ui.OneUICameraControls; import com.android.camera.ui.CountDownView; import com.android.camera.ui.FlashToggleButton; -import com.android.camera.ui.FocusIndicator; +import com.android.camera.ui.focus.FocusRing; import com.android.camera.ui.PieRenderer; import com.android.camera.ui.ProMode; import com.android.camera.ui.RenderOverlay; @@ -94,8 +93,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; -public class CaptureUI implements FocusOverlayManager.FocusUI, - PreviewGestures.SingleTapListener, +public class CaptureUI implements PreviewGestures.SingleTapListener, CameraManager.CameraFaceDetectionCallback, SettingsManager.Listener, PauseButton.OnPauseButtonListener { @@ -107,6 +105,7 @@ public class CaptureUI implements FocusOverlayManager.FocusUI, private static final int ANIMATION_DURATION = 300; private static final int CLICK_THRESHOLD = 200; private static final int AUTOMATIC_MODE = 0; + private final FocusRing mFocusRing; private CameraActivity mActivity; private View mRootView; private View mPreviewCover; @@ -180,7 +179,6 @@ public class CaptureUI implements FocusOverlayManager.FocusUI, private FlashToggleButton mFlashButton; private CountDownView mCountDownView; private OneUICameraControls mCameraControls; - private MenuHelp mMenuHelp; private PieRenderer mPieRenderer; private ZoomRenderer mZoomRenderer; private Allocation mMonoDummyAllocation; @@ -302,6 +300,8 @@ public class CaptureUI implements FocusOverlayManager.FocusUI, mSurfaceHolderMono = mSurfaceViewMono.getHolder(); mSurfaceHolderMono.addCallback(callbackMono); + mFocusRing = (FocusRing) mRootView.findViewById(R.id.focus_ring); + mRenderOverlay = (RenderOverlay) mRootView.findViewById(R.id.render_overlay); mShutterButton = (ShutterButton) mRootView.findViewById(R.id.shutter_button); mVideoButton = (ImageView) mRootView.findViewById(R.id.video_button); @@ -553,7 +553,6 @@ public class CaptureUI implements FocusOverlayManager.FocusUI, mActivity.setPreviewGestures(mGestures); mRecordingTimeRect.setVisibility(View.GONE); - showFirstTimeHelp(); } protected void showCapturedImageForReview(byte[] jpegData, int orientation) { @@ -716,13 +715,8 @@ public class CaptureUI implements FocusOverlayManager.FocusUI, mVideoButton.setVisibility(View.VISIBLE); } mShutterButton.setOnShutterButtonListener(mModule); - mShutterButton.setImageResource(R.drawable.one_ui_shutter_anim); - mShutterButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - doShutterAnimation(); - } - }); + mShutterButton.setImageResource(R.drawable.btn_new_shutter); + mVideoButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -769,7 +763,6 @@ public class CaptureUI implements FocusOverlayManager.FocusUI, if (mPreviewLayout != null && mPreviewLayout.getVisibility() == View.VISIBLE) { return; } - clearFocus(); removeFilterMenu(false); Intent intent = new Intent(mActivity, SettingsActivity.class); mActivity.startActivity(intent); @@ -815,7 +808,6 @@ public class CaptureUI implements FocusOverlayManager.FocusUI, mSceneModeSwitcher.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - clearFocus(); removeFilterMenu(false); Intent intent = new Intent(mActivity, SceneModeActivity.class); intent.putExtra(CameraUtil.KEY_IS_SECURE_CAMERA, mActivity.isSecureCamera()); @@ -872,7 +864,7 @@ public class CaptureUI implements FocusOverlayManager.FocusUI, } else { mFlashButton.setVisibility(View.VISIBLE); mFlashButton.init(false); - mVideoButton.setImageResource(R.drawable.video_capture); + mVideoButton.setImageResource(R.drawable.btn_new_shutter_video); mRecordingTimeRect.setVisibility(View.GONE); mMuteButton.setVisibility(View.INVISIBLE); } @@ -1010,7 +1002,6 @@ public class CaptureUI implements FocusOverlayManager.FocusUI, } } - public void resetTrackingFocus() { if(mModule.isTrackingFocusSettingOn()) { mTrackingFocusRenderer.setVisible(false); @@ -1122,10 +1113,8 @@ public class CaptureUI implements FocusOverlayManager.FocusUI, mSettingsManager.setValueIndex(SettingsManager .KEY_COLOR_EFFECT, j); for (View v1 : views) { - v1.setBackground(null); + v1.setActivated(v1 == v); } - ImageView image = (ImageView) v.findViewById(R.id.image); - image.setBackgroundColor(HIGHLIGHT_COLOR); } } return true; @@ -1133,10 +1122,8 @@ public class CaptureUI implements FocusOverlayManager.FocusUI, }); views[j] = imageView; - if (i == init) - imageView.setBackgroundColor(HIGHLIGHT_COLOR); + imageView.setActivated(i == init); TextView label = (TextView) filterBox.findViewById(R.id.label); - imageView.setImageResource(thumbnails[i]); label.setText(entries[i]); gridLayout.addView(filterBox); @@ -1151,7 +1138,7 @@ public class CaptureUI implements FocusOverlayManager.FocusUI, public void animateFadeIn(View v) { ViewPropertyAnimator vp = v.animate(); - vp.alpha(0.85f).setDuration(ANIMATION_DURATION); + vp.alpha(1f).setDuration(ANIMATION_DURATION); vp.start(); } @@ -1284,17 +1271,10 @@ public class CaptureUI implements FocusOverlayManager.FocusUI, } } - public void doShutterAnimation() { - AnimationDrawable frameAnimation = (AnimationDrawable) mShutterButton.getDrawable(); - frameAnimation.stop(); - frameAnimation.start(); - } - public void showUI() { if (!mUIhidden) return; mUIhidden = false; - mPieRenderer.setBlockFocus(false); mCameraControls.showUI(); } @@ -1302,7 +1282,6 @@ public class CaptureUI implements FocusOverlayManager.FocusUI, if (mUIhidden) return; mUIhidden = true; - mPieRenderer.setBlockFocus(true); mCameraControls.hideUI(); } @@ -1540,74 +1519,8 @@ public class CaptureUI implements FocusOverlayManager.FocusUI, mCameraControls.showRefocusToast(show); } - private FocusIndicator getFocusIndicator() { - if (mModule.isTrackingFocusSettingOn()) { - if (mPieRenderer != null) { - mPieRenderer.clear(); - } - return mTrackingFocusRenderer; - } - FocusIndicator focusIndicator; - if (mFaceView != null && mFaceView.faceExists() && !mIsTouchAF) { - if (mPieRenderer != null) { - mPieRenderer.clear(); - } - focusIndicator = mFaceView; - } else { - focusIndicator = mPieRenderer; - } - - return focusIndicator; - } - - @Override - public boolean hasFaces() { - return (mFaceView != null && mFaceView.faceExists()); - } - - public void clearFaces() { - if (mFaceView != null) mFaceView.clear(); - } - - @Override - public void clearFocus() { - FocusIndicator indicator = getFocusIndicator(); - if (indicator != null) indicator.clear(); - mIsTouchAF = false; - } - - @Override - public void setFocusPosition(int x, int y) { - mPieRenderer.setFocus(x, y); - mIsTouchAF = true; - } - - @Override - public void onFocusStarted() { - FocusIndicator indicator = getFocusIndicator(); - if (indicator != null) indicator.showStart(); - } - - @Override - public void onFocusSucceeded(boolean timeout) { - FocusIndicator indicator = getFocusIndicator(); - if (indicator != null) indicator.showSuccess(timeout); - } - - @Override - public void onFocusFailed(boolean timeOut) { - FocusIndicator indicator = getFocusIndicator(); - if (indicator != null) indicator.showFail(timeOut); - - } - - @Override - public void pauseFaceDetection() { - - } - - @Override - public void resumeFaceDetection() { + public FocusRing getFocusRing() { + return mFocusRing; } public void onStartFaceDetection(int orientation, boolean mirror, Rect cameraBound, @@ -1657,9 +1570,6 @@ public class CaptureUI implements FocusOverlayManager.FocusUI, public void setOrientation(int orientation, boolean animation) { mOrientation = orientation; mCameraControls.setOrientation(orientation, animation); - if (mMenuHelp != null) { - mMenuHelp.setOrientation(orientation, animation); - } if (mFilterLayout != null) { ViewGroup vg = (ViewGroup) mFilterLayout.getChildAt(0); if (vg != null) @@ -1716,33 +1626,6 @@ public class CaptureUI implements FocusOverlayManager.FocusUI, return mOrientation; } - public void showFirstTimeHelp() { - final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(mActivity); - boolean isMenuShown = prefs.getBoolean(CameraSettings.KEY_SHOW_MENU_HELP, false); - if(!isMenuShown) { - showFirstTimeHelp(mTopMargin, mBottomMargin); - SharedPreferences.Editor editor = prefs.edit(); - editor.putBoolean(CameraSettings.KEY_SHOW_MENU_HELP, true); - editor.apply(); - } - } - - private void showFirstTimeHelp(int topMargin, int bottomMargin) { - mMenuHelp = (MenuHelp) mRootView.findViewById(R.id.menu_help); - mMenuHelp.setForCamera2(true); - mMenuHelp.setVisibility(View.VISIBLE); - mMenuHelp.setMargins(topMargin, bottomMargin); - mMenuHelp.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (mMenuHelp != null) { - mMenuHelp.setVisibility(View.GONE); - mMenuHelp = null; - } - } - }); - } - @Override public void onSingleTapUp(View view, int x, int y) { mModule.onSingleTapUp(view, x, y); |