diff options
| author | Senpo Hu <senpo@google.com> | 2015-01-05 16:47:29 -0800 |
|---|---|---|
| committer | Senpo Hu <senpo@google.com> | 2015-01-05 16:47:29 -0800 |
| commit | 8897101881c0df691970deabd866d8ff96f07b0c (patch) | |
| tree | c5c62f9e4ebf7d07102ab86fca0540ccaa16ee25 /src/com/android/camera/widget | |
| parent | 465462e82b3f2855d41d2d8c2e7427287ebbb8b9 (diff) | |
| download | android_packages_apps_Camera2-8897101881c0df691970deabd866d8ff96f07b0c.tar.gz android_packages_apps_Camera2-8897101881c0df691970deabd866d8ff96f07b0c.tar.bz2 android_packages_apps_Camera2-8897101881c0df691970deabd866d8ff96f07b0c.zip | |
Avoid using fast_out_slow_in on K devices.
Bug: 18895268
Change-Id: I9bcd799c5a27b2e05cf45bb5923dcf8e7d0f7123
Diffstat (limited to 'src/com/android/camera/widget')
| -rw-r--r-- | src/com/android/camera/widget/FilmstripLayout.java | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/com/android/camera/widget/FilmstripLayout.java b/src/com/android/camera/widget/FilmstripLayout.java index 90d2e7203..398310050 100644 --- a/src/com/android/camera/widget/FilmstripLayout.java +++ b/src/com/android/camera/widget/FilmstripLayout.java @@ -17,6 +17,7 @@ package com.android.camera.widget; import android.animation.Animator; +import android.animation.TimeInterpolator; import android.animation.ValueAnimator; import android.content.Context; import android.graphics.Canvas; @@ -35,6 +36,8 @@ import android.widget.FrameLayout; import com.android.camera.filmstrip.FilmstripContentPanel; import com.android.camera.filmstrip.FilmstripController; import com.android.camera.ui.FilmstripGestureRecognizer; +import com.android.camera.util.ApiHelper; +import com.android.camera.util.Gusterpolator; import com.android.camera2.R; /** @@ -122,8 +125,14 @@ public class FilmstripLayout extends FrameLayout implements FilmstripContentPane private void init(Context context) { mGestureRecognizer = new FilmstripGestureRecognizer(context, new MyGestureListener()); mFilmstripAnimator.setDuration(DEFAULT_DURATION_MS); - mFilmstripAnimator.setInterpolator(AnimationUtils.loadInterpolator( - getContext(), android.R.interpolator.fast_out_slow_in)); + TimeInterpolator interpolator; + if (ApiHelper.isLOrHigher()) { + interpolator = AnimationUtils.loadInterpolator( + getContext(), android.R.interpolator.fast_out_slow_in); + } else { + interpolator = Gusterpolator.INSTANCE; + } + mFilmstripAnimator.setInterpolator(interpolator); mFilmstripAnimator.addUpdateListener(mFilmstripAnimatorUpdateListener); mFilmstripAnimator.addListener(mFilmstripAnimatorListener); mHandler = new Handler(Looper.getMainLooper()); |