diff options
| -rw-r--r-- | res/values-xlarge/config.xml | 8 | ||||
| -rw-r--r-- | src/com/android/launcher2/Launcher.java | 14 |
2 files changed, 11 insertions, 11 deletions
diff --git a/res/values-xlarge/config.xml b/res/values-xlarge/config.xml index 242e96a..d5da593 100644 --- a/res/values-xlarge/config.xml +++ b/res/values-xlarge/config.xml @@ -9,7 +9,7 @@ <!-- Duration in milliseconds of the all apps / configuration zoom-in animation. --> <!-- NB: This should be less than the workspaceShrinkTime as they happen together. --> - <integer name="config_allAppsZoomInTime">800</integer> + <integer name="config_allAppsZoomInTime">900</integer> <!-- Duration in milliseconds of the transition between tabs in the all apps/customize tray --> @@ -17,7 +17,7 @@ <!-- Duration in milliseconds of the all apps zoom-out animation --> <!-- NB: This should be less than the workspaceUnshrinkTime as they happen together. --> - <integer name="config_allAppsZoomOutTime">600</integer> + <integer name="config_allAppsZoomOutTime">1400</integer> <!-- Scaling factor used in the all apps zooming animations --> <integer name="config_allAppsZoomScaleFactor">10</integer> @@ -36,9 +36,9 @@ <!-- Duration in milliseconds of the animations between all apps, customize, & home. NOTE: If these are changed, the toolbar animation times below should also be. --> <integer name="config_allAppsCameraPanTime">700</integer> - <integer name="config_allAppsFadeOutTime">150</integer> + <integer name="config_allAppsFadeOutTime">400</integer> <integer name="config_customizeWorkspaceShrinkTime">800</integer> - <integer name="config_allAppsWorkspaceShrinkTime">800</integer> + <integer name="config_allAppsWorkspaceShrinkTime">950</integer> <integer name="config_workspaceUnshrinkTime">450</integer> <!-- Duration in milliseconds toolbar fade in and fade out animations. diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index a5799ae..a592f20 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) { |