Snap: update shutter buttons on CaptureUI

https://review.lineageos.org/#/c/200740/

Change-Id: I674de05dfb46fb714979ac66c16a85825af13c95

3 files changed, 4 insertions, 29 deletions

diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java
index 687d21905..6581b4568 100755
--- a/src/com/android/camera/CaptureModule.java
+++ b/src/com/android/camera/CaptureModule.java
@@ -1616,12 +1616,6 @@ public class CaptureModule implements CameraModule, PhotoController,
                         Log.d(TAG, "captureStillPictureForLongshot onCaptureCompleted: " + id);
                         if (mLongshotActive) {
                             checkAndPlayShutterSound(id);
-                            mActivity.runOnUiThread(new Runnable() {
-                                @Override
-                                public void run() {
-                                    mUI.doShutterAnimation();
-                                }
-                            });
                         }
                     }
 
@@ -1630,14 +1624,6 @@ public class CaptureModule implements CameraModule, PhotoController,
                                                 CaptureRequest request,
                                                 CaptureFailure result) {
                         Log.d(TAG, "captureStillPictureForLongshot onCaptureFailed: " + id);
-                        if (mLongshotActive) {
-                            mActivity.runOnUiThread(new Runnable() {
-                                @Override
-                                public void run() {
-                                    mUI.doShutterAnimation();
-                                }
-                            });
-                        }
                     }
 
                     @Override
diff --git a/src/com/android/camera/CaptureUI.java b/src/com/android/camera/CaptureUI.java
index 502e7a669..2293ce953 100644
--- a/src/com/android/camera/CaptureUI.java
+++ b/src/com/android/camera/CaptureUI.java
@@ -633,13 +633,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) {
@@ -788,7 +783,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);
         }
@@ -1177,12 +1172,6 @@ public class CaptureUI implements FocusOverlayManager.FocusUI,
         }
     }
 
-    public void doShutterAnimation() {
-        AnimationDrawable frameAnimation = (AnimationDrawable) mShutterButton.getDrawable();
-        frameAnimation.stop();
-        frameAnimation.start();
-    }
-
     public void showUI() {
         if (!mUIhidden)
             return;
diff --git a/src/com/android/camera/ui/OneUICameraControls.java b/src/com/android/camera/ui/OneUICameraControls.java
index 04c828604..1d7eb72a8 100644
--- a/src/com/android/camera/ui/OneUICameraControls.java
+++ b/src/com/android/camera/ui/OneUICameraControls.java
@@ -492,7 +492,7 @@ public class OneUICameraControls extends RotatableLayout {
         mOrientation = orientation;
         View[] views = {
                 mSceneModeSwitcher, mFilterModeSwitcher, mFrontBackSwitcher,
-                mTsMakeupSwitcher, mFlashButton, mPreview, mMute, mShutter, mVideoShutter,
+                mTsMakeupSwitcher, mFlashButton, mPreview, mMute,
                 mMakeupSeekBarLowText, mMakeupSeekBarHighText, mPauseButton, mExitBestPhotpMode
         };