diff options
33 files changed, 144 insertions, 74 deletions
diff --git a/res/drawable-hdpi/shutter_button_stop.png b/res/drawable-hdpi/shutter_button_stop.png Binary files differdeleted file mode 100644 index ae6c1dc79..000000000 --- a/res/drawable-hdpi/shutter_button_stop.png +++ /dev/null diff --git a/res/drawable-hdpi/shutter_button_video.png b/res/drawable-hdpi/shutter_button_video.png Binary files differdeleted file mode 100644 index 345c41891..000000000 --- a/res/drawable-hdpi/shutter_button_video.png +++ /dev/null diff --git a/res/drawable-hdpi/shutter_button_video_dim.png b/res/drawable-hdpi/shutter_button_video_dim.png Binary files differdeleted file mode 100644 index 88fad94e9..000000000 --- a/res/drawable-hdpi/shutter_button_video_dim.png +++ /dev/null diff --git a/res/drawable-hdpi/shutter_button_video_stop.png b/res/drawable-hdpi/shutter_button_video_stop.png Binary files differdeleted file mode 100644 index f5e1fb8ed..000000000 --- a/res/drawable-hdpi/shutter_button_video_stop.png +++ /dev/null diff --git a/res/drawable-hdpi/shutter_panorama.png b/res/drawable-hdpi/shutter_panorama.png Binary files differdeleted file mode 100644 index 16f044336..000000000 --- a/res/drawable-hdpi/shutter_panorama.png +++ /dev/null diff --git a/res/drawable-hdpi/shutter_panorama_dim.png b/res/drawable-hdpi/shutter_panorama_dim.png Binary files differdeleted file mode 100644 index d7c7a0625..000000000 --- a/res/drawable-hdpi/shutter_panorama_dim.png +++ /dev/null diff --git a/res/drawable-mdpi/shutter_button_stop.png b/res/drawable-mdpi/shutter_button_stop.png Binary files differdeleted file mode 100644 index 7058814e3..000000000 --- a/res/drawable-mdpi/shutter_button_stop.png +++ /dev/null diff --git a/res/drawable-mdpi/shutter_button_video.png b/res/drawable-mdpi/shutter_button_video.png Binary files differdeleted file mode 100644 index 1fad54077..000000000 --- a/res/drawable-mdpi/shutter_button_video.png +++ /dev/null diff --git a/res/drawable-mdpi/shutter_button_video_dim.png b/res/drawable-mdpi/shutter_button_video_dim.png Binary files differdeleted file mode 100644 index 721abc37a..000000000 --- a/res/drawable-mdpi/shutter_button_video_dim.png +++ /dev/null diff --git a/res/drawable-mdpi/shutter_button_video_stop.png b/res/drawable-mdpi/shutter_button_video_stop.png Binary files differdeleted file mode 100644 index 00985ae33..000000000 --- a/res/drawable-mdpi/shutter_button_video_stop.png +++ /dev/null diff --git a/res/drawable-mdpi/shutter_panorama.png b/res/drawable-mdpi/shutter_panorama.png Binary files differdeleted file mode 100644 index b140e57e0..000000000 --- a/res/drawable-mdpi/shutter_panorama.png +++ /dev/null diff --git a/res/drawable-mdpi/shutter_panorama_dim.png b/res/drawable-mdpi/shutter_panorama_dim.png Binary files differdeleted file mode 100644 index b6e22f920..000000000 --- a/res/drawable-mdpi/shutter_panorama_dim.png +++ /dev/null diff --git a/res/drawable-xhdpi/shutter_button_stop.png b/res/drawable-xhdpi/shutter_button_stop.png Binary files differdeleted file mode 100644 index 88f60d3c4..000000000 --- a/res/drawable-xhdpi/shutter_button_stop.png +++ /dev/null diff --git a/res/drawable-xhdpi/shutter_button_video.png b/res/drawable-xhdpi/shutter_button_video.png Binary files differdeleted file mode 100644 index da58053fe..000000000 --- a/res/drawable-xhdpi/shutter_button_video.png +++ /dev/null diff --git a/res/drawable-xhdpi/shutter_button_video_dim.png b/res/drawable-xhdpi/shutter_button_video_dim.png Binary files differdeleted file mode 100644 index fc41296f8..000000000 --- a/res/drawable-xhdpi/shutter_button_video_dim.png +++ /dev/null diff --git a/res/drawable-xhdpi/shutter_button_video_stop.png b/res/drawable-xhdpi/shutter_button_video_stop.png Binary files differdeleted file mode 100644 index 44df24b97..000000000 --- a/res/drawable-xhdpi/shutter_button_video_stop.png +++ /dev/null diff --git a/res/drawable-xhdpi/shutter_panorama.png b/res/drawable-xhdpi/shutter_panorama.png Binary files differdeleted file mode 100644 index 8cfd7ee2c..000000000 --- a/res/drawable-xhdpi/shutter_panorama.png +++ /dev/null diff --git a/res/drawable-xhdpi/shutter_panorama_dim.png b/res/drawable-xhdpi/shutter_panorama_dim.png Binary files differdeleted file mode 100644 index 606032b5a..000000000 --- a/res/drawable-xhdpi/shutter_panorama_dim.png +++ /dev/null diff --git a/res/drawable/btn_new_shutter.xml b/res/drawable/btn_new_shutter.xml index 53bef3176..a41581238 100644 --- a/res/drawable/btn_new_shutter.xml +++ b/res/drawable/btn_new_shutter.xml @@ -15,6 +15,7 @@ --> <selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_pressed="true" android:drawable="@drawable/shutter_button_dim" /> - <item android:drawable="@drawable/shutter_button_0" /> + <item android:state_pressed="true" + android:drawable="@drawable/shutter_button_pressed" /> + <item android:drawable="@drawable/shutter_button_normal" /> </selector> diff --git a/res/drawable/shutter_button_normal.xml b/res/drawable/shutter_button_normal.xml new file mode 100644 index 000000000..9e1f9aad1 --- /dev/null +++ b/res/drawable/shutter_button_normal.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="utf-8"?> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="@dimen/shutter_size" + android:height="@dimen/shutter_size" + android:viewportWidth="80" + android:viewportHeight="80"> + + <path + android:fillColor="@color/pic" + android:strokeWidth="1" + android:pathData="M 40 10.5 C 56.29240012 10.5 69.5 23.70759988 69.5 40 C 69.5 56.29240012 56.29240012 69.5 40 69.5 C 23.70759988 69.5 10.5 56.29240012 10.5 40 C 10.5 23.70759988 23.70759988 10.5 40 10.5 Z" /> + <path + android:strokeColor="@color/blue" + android:strokeWidth="7" + android:pathData="M 40 3.5 C 60.1583933688 3.5 76.5 19.8416066312 76.5 40 C 76.5 60.1583933688 60.1583933688 76.5 40 76.5 C 19.8416066312 76.5 3.5 60.1583933688 3.5 40 C 3.5 19.8416066312 19.8416066312 3.5 40 3.5 Z" /> + +</vector> diff --git a/res/drawable/shutter_button_pressed.xml b/res/drawable/shutter_button_pressed.xml new file mode 100644 index 000000000..32dbd58ee --- /dev/null +++ b/res/drawable/shutter_button_pressed.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="utf-8"?> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="@dimen/shutter_size" + android:height="@dimen/shutter_size" + android:viewportWidth="80" + android:viewportHeight="80"> + + <path + android:fillColor="@color/pic_pressed" + android:strokeWidth="1" + android:pathData="M 40 12.5 C 55.1878306203 12.5 67.5 24.8121693797 67.5 40 C 67.5 55.1878306203 55.1878306203 67.5 40 67.5 C 24.8121693797 67.5 12.5 55.1878306203 12.5 40 C 12.5 24.8121693797 24.8121693797 12.5 40 12.5 Z" /> + <path + android:strokeColor="@color/blue" + android:strokeWidth="7" + android:pathData="M 40 3.5 C 60.1583933688 3.5 76.5 19.8416066312 76.5 40 C 76.5 60.1583933688 60.1583933688 76.5 40 76.5 C 19.8416066312 76.5 3.5 60.1583933688 3.5 40 C 3.5 19.8416066312 19.8416066312 3.5 40 3.5 Z" /> + +</vector> diff --git a/res/drawable/shutter_button_stop.xml b/res/drawable/shutter_button_stop.xml new file mode 100644 index 000000000..8954092bc --- /dev/null +++ b/res/drawable/shutter_button_stop.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="utf-8"?> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="@dimen/shutter_size" + android:height="@dimen/shutter_size" + android:viewportWidth="80" + android:viewportHeight="80"> + + <path + android:fillColor="@color/pano_stop" + android:strokeWidth="1" + android:pathData="M 40 12.5 C 55.1878306203 12.5 67.5 24.8121693797 67.5 40 C 67.5 55.1878306203 55.1878306203 67.5 40 67.5 C 24.8121693797 67.5 12.5 55.1878306203 12.5 40 C 12.5 24.8121693797 24.8121693797 12.5 40 12.5 Z" /> + <path + android:strokeColor="@color/white" + android:strokeWidth="7" + android:pathData="M 40 3.5 C 60.1583933688 3.5 76.5 19.8416066312 76.5 40 C 76.5 60.1583933688 60.1583933688 76.5 40 76.5 C 19.8416066312 76.5 3.5 60.1583933688 3.5 40 C 3.5 19.8416066312 19.8416066312 3.5 40 3.5 Z" /> + +</vector> diff --git a/res/drawable/shutter_button_video.xml b/res/drawable/shutter_button_video.xml new file mode 100644 index 000000000..8c70e7d85 --- /dev/null +++ b/res/drawable/shutter_button_video.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="utf-8"?> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="@dimen/shutter_size" + android:height="@dimen/shutter_size" + android:viewportWidth="80" + android:viewportHeight="80"> + + <path + android:fillColor="@color/video" + android:strokeWidth="1" + android:pathData="M 40 10.5 C 56.29240012 10.5 69.5 23.70759988 69.5 40 C 69.5 56.29240012 56.29240012 69.5 40 69.5 C 23.70759988 69.5 10.5 56.29240012 10.5 40 C 10.5 23.70759988 23.70759988 10.5 40 10.5 Z" /> + <path + android:strokeColor="@color/white" + android:strokeWidth="7" + android:pathData="M 40 3.5 C 60.1583933688 3.5 76.5 19.8416066312 76.5 40 C 76.5 60.1583933688 60.1583933688 76.5 40 76.5 C 19.8416066312 76.5 3.5 60.1583933688 3.5 40 C 3.5 19.8416066312 19.8416066312 3.5 40 3.5 Z" /> + +</vector> diff --git a/res/drawable/shutter_button_video_dim.xml b/res/drawable/shutter_button_video_dim.xml new file mode 100644 index 000000000..c3de0c04c --- /dev/null +++ b/res/drawable/shutter_button_video_dim.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="utf-8"?> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="@dimen/shutter_size" + android:height="@dimen/shutter_size" + android:viewportWidth="80" + android:viewportHeight="80"> + + <path + android:fillColor="@color/video_pressed" + android:strokeWidth="1" + android:pathData="M 40 12.5 C 55.1878306203 12.5 67.5 24.8121693797 67.5 40 C 67.5 55.1878306203 55.1878306203 67.5 40 67.5 C 24.8121693797 67.5 12.5 55.1878306203 12.5 40 C 12.5 24.8121693797 24.8121693797 12.5 40 12.5 Z" /> + <path + android:strokeColor="@color/white" + android:strokeWidth="7" + android:pathData="M 40 3.5 C 60.1583933688 3.5 76.5 19.8416066312 76.5 40 C 76.5 60.1583933688 60.1583933688 76.5 40 76.5 C 19.8416066312 76.5 3.5 60.1583933688 3.5 40 C 3.5 19.8416066312 19.8416066312 3.5 40 3.5 Z" /> + +</vector> diff --git a/res/drawable/shutter_button_video_stop.xml b/res/drawable/shutter_button_video_stop.xml new file mode 100644 index 000000000..9acc1a297 --- /dev/null +++ b/res/drawable/shutter_button_video_stop.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="utf-8"?> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="@dimen/shutter_size" + android:height="@dimen/shutter_size" + android:viewportWidth="80" + android:viewportHeight="80"> + + <path + android:fillColor="@color/video_stop" + android:strokeWidth="1" + android:pathData="M 40 12.5 C 55.1878306203 12.5 67.5 24.8121693797 67.5 40 C 67.5 55.1878306203 55.1878306203 67.5 40 67.5 C 24.8121693797 67.5 12.5 55.1878306203 12.5 40 C 12.5 24.8121693797 24.8121693797 12.5 40 12.5 Z" /> + <path + android:strokeColor="@color/white" + android:strokeWidth="7" + android:pathData="M 40 3.5 C 60.1583933688 3.5 76.5 19.8416066312 76.5 40 C 76.5 60.1583933688 60.1583933688 76.5 40 76.5 C 19.8416066312 76.5 3.5 60.1583933688 3.5 40 C 3.5 19.8416066312 19.8416066312 3.5 40 3.5 Z" /> + +</vector> diff --git a/res/drawable/shutter_panorama.xml b/res/drawable/shutter_panorama.xml new file mode 100644 index 000000000..e68ddc3dc --- /dev/null +++ b/res/drawable/shutter_panorama.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="utf-8"?> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="@dimen/shutter_size" + android:height="@dimen/shutter_size" + android:viewportWidth="80" + android:viewportHeight="80"> + + <path + android:fillColor="@color/pano" + android:strokeWidth="1" + android:pathData="M 40 10.5 C 56.29240012 10.5 69.5 23.70759988 69.5 40 C 69.5 56.29240012 56.29240012 69.5 40 69.5 C 23.70759988 69.5 10.5 56.29240012 10.5 40 C 10.5 23.70759988 23.70759988 10.5 40 10.5 Z" /> + <path + android:strokeColor="@color/white" + android:strokeWidth="7" + android:pathData="M 40 3.5 C 60.1583933688 3.5 76.5 19.8416066312 76.5 40 C 76.5 60.1583933688 60.1583933688 76.5 40 76.5 C 19.8416066312 76.5 3.5 60.1583933688 3.5 40 C 3.5 19.8416066312 19.8416066312 3.5 40 3.5 Z" /> + +</vector> diff --git a/res/drawable/shutter_panorama_dim.xml b/res/drawable/shutter_panorama_dim.xml new file mode 100644 index 000000000..a9b69e347 --- /dev/null +++ b/res/drawable/shutter_panorama_dim.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="utf-8"?> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="@dimen/shutter_size" + android:height="@dimen/shutter_size" + android:viewportWidth="80" + android:viewportHeight="80"> + + <path + android:fillColor="@color/pano_pressed" + android:strokeWidth="1" + android:pathData="M 40 12.5 C 55.1878306203 12.5 67.5 24.8121693797 67.5 40 C 67.5 55.1878306203 55.1878306203 67.5 40 67.5 C 24.8121693797 67.5 12.5 55.1878306203 12.5 40 C 12.5 24.8121693797 24.8121693797 12.5 40 12.5 Z" /> + <path + android:strokeColor="@color/white" + android:strokeWidth="7" + android:pathData="M 40 3.5 C 60.1583933688 3.5 76.5 19.8416066312 76.5 40 C 76.5 60.1583933688 60.1583933688 76.5 40 76.5 C 19.8416066312 76.5 3.5 60.1583933688 3.5 40 C 3.5 19.8416066312 19.8416066312 3.5 40 3.5 Z" /> + +</vector> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 4ac548fb0..210b4739c 100755 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -106,7 +106,7 @@ <dimen name="capture_margin_top">16dip</dimen> <dimen name="camera_controls_size">0dip</dimen> <dimen name="camera_film_strip_gap">32dip</dimen> - <dimen name="shutter_size">80dp</dimen> + <dimen name="shutter_size">68dp</dimen> <dimen name="appwidget_width">180dp</dimen> <dimen name="appwidget_height">180dp</dimen> diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 21b53c3d2..e9a5b34e8 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -1145,8 +1145,6 @@ public class PhotoModule return; } - mUI.doShutterAnimation(); - Location loc = getLocationAccordPictureFormat(mParameters.get(KEY_PICTURE_FORMAT)); mLongShotCaptureCount++; diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java index a075de464..b08c8f108 100644 --- a/src/com/android/camera/PhotoUI.java +++ b/src/com/android/camera/PhotoUI.java @@ -649,29 +649,11 @@ public class PhotoUI implements PieListener, // called from onResume but only the first time public void initializeFirstTime() { // Initialize shutter button. - mShutterButton.setImageResource(R.drawable.shutter_button_anim); - mShutterButton.setOnClickListener(new OnClickListener() - { - @Override - public void onClick(View v) { - if (!CameraControls.isAnimating()) - doShutterAnimation(); - if (mController.isImageCaptureIntent()) { - mCameraControls.setTitleBarVisibility(View.VISIBLE); - } - } - }); - + mShutterButton.setImageResource(R.drawable.btn_new_shutter); mShutterButton.setOnShutterButtonListener(mController); mShutterButton.setVisibility(View.VISIBLE); } - public void doShutterAnimation() { - AnimationDrawable frameAnimation = (AnimationDrawable) mShutterButton.getDrawable(); - frameAnimation.stop(); - frameAnimation.start(); - } - // called from onResume every other time public void initializeSecondTime(Camera.Parameters params) { initializeZoom(params); diff --git a/src/com/android/camera/ShutterButton.java b/src/com/android/camera/ShutterButton.java index b35658070..22223510c 100644 --- a/src/com/android/camera/ShutterButton.java +++ b/src/com/android/camera/ShutterButton.java @@ -22,14 +22,12 @@ import android.view.MotionEvent; import android.view.View; import android.widget.ImageView; -import com.android.camera.ui.RotateImageView; - /** * A button designed to be used for the on-screen shutter button. * It's currently an {@code ImageView} that can call a delegate when the * pressed state changes. */ -public class ShutterButton extends RotateImageView { +public class ShutterButton extends ImageView { private class LongClickListener implements View.OnLongClickListener { public boolean onLongClick(View v) { @@ -84,51 +82,6 @@ public class ShutterButton extends RotateImageView { setLongClickable(enable); } - /** - * Hook into the drawable state changing to get changes to isPressed -- the - * onPressed listener doesn't always get called when the pressed state - * changes. - */ - @Override - protected void drawableStateChanged() { - super.drawableStateChanged(); - final boolean pressed = isPressed(); - if (pressed != mOldPressed) { - if (!pressed) { - // When pressing the physical camera button the sequence of - // events is: - // focus pressed, optional camera pressed, focus released. - // We want to emulate this sequence of events with the shutter - // button. When clicking using a trackball button, the view - // system changes the drawable state before posting click - // notification, so the sequence of events is: - // pressed(true), optional click, pressed(false) - // When clicking using touch events, the view system changes the - // drawable state after posting click notification, so the - // sequence of events is: - // pressed(true), pressed(false), optional click - // Since we're emulating the physical camera button, we want to - // have the same order of events. So we want the optional click - // callback to be delivered before the pressed(false) callback. - // - // To do this, we delay the posting of the pressed(false) event - // slightly by pushing it on the event queue. This moves it - // after the optional click notification, so our client always - // sees events in this sequence: - // pressed(true), optional click, pressed(false) - post(new Runnable() { - @Override - public void run() { - callShutterButtonFocus(pressed); - } - }); - } else { - callShutterButtonFocus(pressed); - } - mOldPressed = pressed; - } - } - private void callShutterButtonFocus(boolean pressed) { if (mListener != null) { mListener.onShutterButtonFocus(pressed); diff --git a/src/com/android/camera/ui/CameraControls.java b/src/com/android/camera/ui/CameraControls.java index 4abe3809c..54355078c 100755 --- a/src/com/android/camera/ui/CameraControls.java +++ b/src/com/android/camera/ui/CameraControls.java @@ -1081,7 +1081,7 @@ public class CameraControls extends RotatableLayout { View[] views = { mSceneModeSwitcher, mFilterModeSwitcher, mFrontBackSwitcher, TsMakeupManager.HAS_TS_MAKEUP ? mTsMakeupSwitcher : mHdrSwitcher,mBokehSwitcher, - mMenu, mShutter, mPreview, mSwitcher, mMute, mReviewRetakeButton, + mMenu, mPreview, mSwitcher, mMute, mReviewRetakeButton, mReviewCancelButton, mReviewDoneButton, mExitPanorama }; for (View v : views) { diff --git a/src/com/android/camera/ui/OneUICameraControls.java b/src/com/android/camera/ui/OneUICameraControls.java index c5daba52f..04c828604 100644 --- a/src/com/android/camera/ui/OneUICameraControls.java +++ b/src/com/android/camera/ui/OneUICameraControls.java @@ -229,7 +229,7 @@ public class OneUICameraControls extends RotatableLayout { mViews = new View[]{ mSceneModeSwitcher, mFilterModeSwitcher, mFrontBackSwitcher, - mTsMakeupSwitcher, mFlashButton, mShutter, mPreview, mVideoShutter, + mTsMakeupSwitcher, mFlashButton, mPreview, mVideoShutter, mPauseButton, mCancelButton }; mBottomLargeSize = getResources().getDimensionPixelSize( |