diff options
| author | Adam Cohen <adamcohen@google.com> | 2011-01-27 20:16:13 -0800 |
|---|---|---|
| committer | Adam Cohen <adamcohen@google.com> | 2011-01-27 20:16:13 -0800 |
| commit | 860f4c5a82d4b3c8d5444f986176a9af6f085df7 (patch) | |
| tree | 05d362273eb9fe7df1ccbf252c53e39876b2c155 /src/com/android/launcher2/Launcher.java | |
| parent | 6e3140865d3f0def2e55934d8b0b2c1503386e54 (diff) | |
| download | android_packages_apps_Trebuchet-860f4c5a82d4b3c8d5444f986176a9af6f085df7.tar.gz android_packages_apps_Trebuchet-860f4c5a82d4b3c8d5444f986176a9af6f085df7.tar.bz2 android_packages_apps_Trebuchet-860f4c5a82d4b3c8d5444f986176a9af6f085df7.zip | |
Final tweaks for home animations
Change-Id: I9a160a71fe22286077fe8601fb30a1a9bbe84da3
Diffstat (limited to 'src/com/android/launcher2/Launcher.java')
| -rw-r--r-- | src/com/android/launcher2/Launcher.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index a5799ae65..a592f208e 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -47,12 +47,12 @@ import android.content.ContentResolver; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; -import android.content.Intent.ShortcutIconResource; import android.content.IntentFilter; +import android.content.Intent.ShortcutIconResource; import android.content.pm.ActivityInfo; import android.content.pm.PackageManager; -import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.ResolveInfo; +import android.content.pm.PackageManager.NameNotFoundException; import android.content.res.Configuration; import android.content.res.Resources; import android.content.res.TypedArray; @@ -88,9 +88,9 @@ import android.view.MenuItem; import android.view.MotionEvent; import android.view.Surface; import android.view.View; -import android.view.View.OnLongClickListener; import android.view.ViewGroup; import android.view.WindowManager; +import android.view.View.OnLongClickListener; import android.view.accessibility.AccessibilityEvent; import android.view.animation.DecelerateInterpolator; import android.view.inputmethod.InputMethodManager; @@ -100,11 +100,11 @@ import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.PopupWindow; import android.widget.TabHost; -import android.widget.TabHost.OnTabChangeListener; -import android.widget.TabHost.TabContentFactory; import android.widget.TabWidget; import android.widget.TextView; import android.widget.Toast; +import android.widget.TabHost.OnTabChangeListener; +import android.widget.TabHost.TabContentFactory; import com.android.common.Search; import com.android.launcher.R; @@ -2684,7 +2684,7 @@ public final class Launcher extends Activity toView.setAlpha(0f); ObjectAnimator alphaAnim = ObjectAnimator.ofPropertyValuesHolder(toView, PropertyValuesHolder.ofFloat("alpha", 1.0f)); - alphaAnim.setInterpolator(new DecelerateInterpolator(1.5f)); + alphaAnim.setInterpolator(new DecelerateInterpolator(1.0f)); alphaAnim.setDuration(duration); alphaAnim.start(); } @@ -2782,7 +2782,7 @@ public final class Launcher extends Activity ValueAnimator alphaAnim = ObjectAnimator.ofPropertyValuesHolder(fromView, PropertyValuesHolder.ofFloat("alpha", 1.0f, 0.0f)); alphaAnim.setDuration(res.getInteger(R.integer.config_allAppsFadeOutTime)); - alphaAnim.setInterpolator(new DecelerateInterpolator(1.5f)); + alphaAnim.setInterpolator(new DecelerateInterpolator(2.0f)); alphaAnim.addListener(new AnimatorListenerAdapter() { @Override public void onAnimationEnd(Animator animation) { |