diff options
-rw-r--r-- | res/drawable/one_ui_shutter_1.png | bin | 0 -> 2957 bytes | |||
-rw-r--r-- | res/drawable/one_ui_shutter_2.png | bin | 0 -> 3062 bytes | |||
-rw-r--r-- | res/drawable/one_ui_shutter_3.png | bin | 0 -> 3184 bytes | |||
-rw-r--r-- | res/drawable/one_ui_shutter_4.png | bin | 0 -> 3131 bytes | |||
-rw-r--r-- | res/drawable/one_ui_shutter_5.png | bin | 0 -> 2947 bytes | |||
-rw-r--r-- | res/drawable/one_ui_shutter_6.png | bin | 0 -> 2699 bytes | |||
-rw-r--r-- | res/drawable/one_ui_shutter_anim.xml | 72 | ||||
-rw-r--r-- | src/com/android/camera/CaptureUI.java | 11 |
8 files changed, 83 insertions, 0 deletions
diff --git a/res/drawable/one_ui_shutter_1.png b/res/drawable/one_ui_shutter_1.png Binary files differnew file mode 100644 index 000000000..46771e0cc --- /dev/null +++ b/res/drawable/one_ui_shutter_1.png diff --git a/res/drawable/one_ui_shutter_2.png b/res/drawable/one_ui_shutter_2.png Binary files differnew file mode 100644 index 000000000..07e1f72de --- /dev/null +++ b/res/drawable/one_ui_shutter_2.png diff --git a/res/drawable/one_ui_shutter_3.png b/res/drawable/one_ui_shutter_3.png Binary files differnew file mode 100644 index 000000000..503135797 --- /dev/null +++ b/res/drawable/one_ui_shutter_3.png diff --git a/res/drawable/one_ui_shutter_4.png b/res/drawable/one_ui_shutter_4.png Binary files differnew file mode 100644 index 000000000..9d3f565af --- /dev/null +++ b/res/drawable/one_ui_shutter_4.png diff --git a/res/drawable/one_ui_shutter_5.png b/res/drawable/one_ui_shutter_5.png Binary files differnew file mode 100644 index 000000000..df6ccd79f --- /dev/null +++ b/res/drawable/one_ui_shutter_5.png diff --git a/res/drawable/one_ui_shutter_6.png b/res/drawable/one_ui_shutter_6.png Binary files differnew file mode 100644 index 000000000..5165ef2c5 --- /dev/null +++ b/res/drawable/one_ui_shutter_6.png diff --git a/res/drawable/one_ui_shutter_anim.xml b/res/drawable/one_ui_shutter_anim.xml new file mode 100644 index 000000000..980b9adad --- /dev/null +++ b/res/drawable/one_ui_shutter_anim.xml @@ -0,0 +1,72 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (c) 2016, The Linux Foundation. All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + * Neither the name of The Linux Foundation nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED + WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT + ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS + BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN + IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +--> +<animation-list xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/shutter_button_pressed" + android:oneshot="true" > + + <item + android:drawable="@drawable/photo_capture" + android:duration="16"/> + <item + android:drawable="@drawable/one_ui_shutter_6" + android:duration="16"/> + <item + android:drawable="@drawable/one_ui_shutter_5" + android:duration="16"/> + <item + android:drawable="@drawable/one_ui_shutter_4" + android:duration="16"/> + <item + android:drawable="@drawable/one_ui_shutter_3" + android:duration="16"/> + <item + android:drawable="@drawable/one_ui_shutter_2" + android:duration="16"/> + <item + android:drawable="@drawable/one_ui_shutter_1" + android:duration="16"/> + <item + android:drawable="@drawable/one_ui_shutter_2" + android:duration="16"/> + <item + android:drawable="@drawable/one_ui_shutter_3" + android:duration="16"/> + <item + android:drawable="@drawable/one_ui_shutter_4" + android:duration="16"/> + <item + android:drawable="@drawable/one_ui_shutter_5" + android:duration="16"/> + <item + android:drawable="@drawable/one_ui_shutter_6" + android:duration="16"/> + <item + android:drawable="@drawable/photo_capture" + android:duration="16"/> +</animation-list> diff --git a/src/com/android/camera/CaptureUI.java b/src/com/android/camera/CaptureUI.java index f1f52247a..75efe6e1a 100644 --- a/src/com/android/camera/CaptureUI.java +++ b/src/com/android/camera/CaptureUI.java @@ -29,6 +29,7 @@ import android.content.res.Resources; import android.graphics.ImageFormat; import android.graphics.Point; import android.graphics.Rect; +import android.graphics.drawable.AnimationDrawable; import android.hardware.Camera.Face; import android.preference.PreferenceManager; import android.renderscript.Allocation; @@ -429,6 +430,13 @@ public class CaptureUI implements FocusOverlayManager.FocusUI, mShutterButton.setOnShutterButtonListener(mModule); mShutterButton.setVisibility(View.VISIBLE); mVideoButton.setVisibility(View.VISIBLE); + mShutterButton.setImageResource(R.drawable.one_ui_shutter_anim); + mShutterButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + doShutterAnimation(); + } + }); mVideoButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -825,6 +833,9 @@ public class CaptureUI implements FocusOverlayManager.FocusUI, } public void doShutterAnimation() { + AnimationDrawable frameAnimation = (AnimationDrawable) mShutterButton.getDrawable(); + frameAnimation.stop(); + frameAnimation.start(); } public void showUI() { |