summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/CaptureUI.java
diff options
context:
space:
mode:
authorcodeworkx <daniel.hillenbrand@codeworkx.de>2018-01-20 12:46:31 +0100
committerArne Coucheron <arco68@gmail.com>2018-01-27 00:41:46 +0100
commitc3cbf5ddea41311975ed9ed598c8b5b7accb20f5 (patch)
tree280f46f07720f9139c1b4cf70423feb42e33c9a4 /src/com/android/camera/CaptureUI.java
parent1fa3d64d1c6f8d59b7c1c87984a587786d723e8e (diff)
downloadandroid_packages_apps_Snap-c3cbf5ddea41311975ed9ed598c8b5b7accb20f5.tar.gz
android_packages_apps_Snap-c3cbf5ddea41311975ed9ed598c8b5b7accb20f5.tar.bz2
android_packages_apps_Snap-c3cbf5ddea41311975ed9ed598c8b5b7accb20f5.zip
Snap: update shutter buttons on CaptureUI
https://review.lineageos.org/#/c/200740/ Change-Id: I674de05dfb46fb714979ac66c16a85825af13c95
Diffstat (limited to 'src/com/android/camera/CaptureUI.java')
-rw-r--r--src/com/android/camera/CaptureUI.java17
1 files changed, 3 insertions, 14 deletions
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;