summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAngus Kong <shkong@google.com>2014-03-04 14:34:30 -0800
committerAngus Kong <shkong@google.com>2014-03-04 14:36:01 -0800
commitd02de7808c906f89c1d331feebcefba6696d8668 (patch)
tree869cb53f2dae9d195c950c69ab8933c8ef63397a /src
parent4d1e5f7569e1728d9be2102f97c02a1213c3b940 (diff)
downloadandroid_packages_apps_Camera2-d02de7808c906f89c1d331feebcefba6696d8668.tar.gz
android_packages_apps_Camera2-d02de7808c906f89c1d331feebcefba6696d8668.tar.bz2
android_packages_apps_Camera2-d02de7808c906f89c1d331feebcefba6696d8668.zip
Reduce the amount of peek animation.
bug:13165526 Change-Id: I3a338c0a770be2d53b8caa5f287d06e64f4549ef
Diffstat (limited to 'src')
-rw-r--r--src/com/android/camera/widget/PeekView.java7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/com/android/camera/widget/PeekView.java b/src/com/android/camera/widget/PeekView.java
index 0357a23d8..c49e29475 100644
--- a/src/com/android/camera/widget/PeekView.java
+++ b/src/com/android/camera/widget/PeekView.java
@@ -38,7 +38,7 @@ import com.android.camera.util.CameraUtil;
*/
public class PeekView extends ImageView {
- private static final float ROTATE_ANGLE = -15f;
+ private static final float ROTATE_ANGLE = -7f;
private static final long PEEK_IN_DURATION_MS = 200;
private static final long PEEK_STAY_DURATION_MS = 100;
private static final long PEEK_OUT_DURATION_MS = 200;
@@ -72,11 +72,6 @@ public class PeekView extends ImageView {
}
@Override
- protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
- super.onMeasure(widthMeasureSpec, heightMeasureSpec);
- }
-
- @Override
protected void onDraw(Canvas c) {
super.onDraw(c);
if (mImageDrawable == null) {