diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2015-06-01 17:15:34 -0700 |
|---|---|---|
| committer | Sunny Goyal <sunnygoyal@google.com> | 2015-06-01 17:16:22 -0700 |
| commit | c1cd23b4a7744105c124c4d9f642134b5f49694f (patch) | |
| tree | b1aa50eaaa3ccb1ea3b6a60c8574dca641b9354d | |
| parent | a07c2f5c80908e8a612f4681314a7068b92baa9f (diff) | |
| download | android_packages_apps_Trebuchet-c1cd23b4a7744105c124c4d9f642134b5f49694f.tar.gz android_packages_apps_Trebuchet-c1cd23b4a7744105c124c4d9f642134b5f49694f.tar.bz2 android_packages_apps_Trebuchet-c1cd23b4a7744105c124c4d9f642134b5f49694f.zip | |
Build fix: Removing FastOutSlowIn interpolator
Change-Id: Ia84445285d013fe8da3c895f5264f329f2403890
| -rw-r--r-- | src/com/android/launcher3/Folder.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java index a5b7a6003..fcfb717ab 100644 --- a/src/com/android/launcher3/Folder.java +++ b/src/com/android/launcher3/Folder.java @@ -29,12 +29,10 @@ import android.graphics.Point; import android.graphics.PointF; import android.graphics.Rect; import android.os.Build; -import android.support.v4.view.animation.FastOutSlowInInterpolator; import android.text.InputType; import android.text.Selection; import android.text.Spannable; import android.util.AttributeSet; -import android.util.LayoutDirection; import android.util.Log; import android.view.ActionMode; import android.view.KeyEvent; @@ -46,6 +44,7 @@ import android.view.ViewGroup; import android.view.accessibility.AccessibilityEvent; import android.view.accessibility.AccessibilityManager; import android.view.animation.AccelerateInterpolator; +import android.view.animation.AnimationUtils; import android.view.inputmethod.EditorInfo; import android.view.inputmethod.InputMethodManager; import android.widget.LinearLayout; @@ -559,7 +558,10 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList public void onAnimationEnd(Animator animation) { mFolderName.animate().setDuration(FOLDER_NAME_ANIMATION_DURATION) .translationX(0) - .setInterpolator(new FastOutSlowInInterpolator()); + .setInterpolator(Utilities.isLmpOrAbove() ? + AnimationUtils.loadInterpolator(mLauncher, + android.R.interpolator.fast_out_slow_in) + : new LogDecelerateInterpolator(100, 0)); mContent.animateMarkers(); if (updateAnimationFlag) { |