diff options
author | Paul Keith <javelinanddart@gmail.com> | 2018-01-01 18:56:04 +0100 |
---|---|---|
committer | Arne Coucheron <arco68@gmail.com> | 2018-01-27 00:41:46 +0100 |
commit | 3e3cc18dd56c4b795f1cd1476e51a38ab1ea9ef3 (patch) | |
tree | b920ea140049c355cf12360b73ae5efd04618e71 /src/com/android/camera/ShutterButton.java | |
parent | eedcecc62459dbebee63d39ed0a07e1bd7733688 (diff) | |
download | android_packages_apps_Snap-3e3cc18dd56c4b795f1cd1476e51a38ab1ea9ef3.tar.gz android_packages_apps_Snap-3e3cc18dd56c4b795f1cd1476e51a38ab1ea9ef3.tar.bz2 android_packages_apps_Snap-3e3cc18dd56c4b795f1cd1476e51a38ab1ea9ef3.zip |
Revert "Snap: Bring back original shutter icons and animation"
No reason to do use caf ones
This reverts commit a465e3a0cf7a81c7cb9a0e80cbfa7527e7d7de77.
Change-Id: I611351ddfa0b24087cc58466dcba95ab4999d1bd
Diffstat (limited to 'src/com/android/camera/ShutterButton.java')
-rw-r--r-- | src/com/android/camera/ShutterButton.java | 49 |
1 files changed, 1 insertions, 48 deletions
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); |