diff options
| author | Michael Jurka <mikejurka@google.com> | 2011-03-02 17:41:34 -0800 |
|---|---|---|
| committer | Michael Jurka <mikejurka@google.com> | 2011-03-02 22:12:05 -0800 |
| commit | 9c6fbed48783dacd9bc6b4ec5f2cc8e59ec7ee37 (patch) | |
| tree | 8a980b3da908c42c774159d74c4f048d42737e76 /src/com/android/launcher2/Launcher.java | |
| parent | 3cba722d4745b29a47ebc6a472dd921e5c9d7367 (diff) | |
| download | android_packages_apps_Trebuchet-9c6fbed48783dacd9bc6b4ec5f2cc8e59ec7ee37.tar.gz android_packages_apps_Trebuchet-9c6fbed48783dacd9bc6b4ec5f2cc8e59ec7ee37.tar.bz2 android_packages_apps_Trebuchet-9c6fbed48783dacd9bc6b4ec5f2cc8e59ec7ee37.zip | |
Further improving performance of All Apps transition
Change-Id: Ie8a2af004acba4c13066dd636842a71793064688
Diffstat (limited to 'src/com/android/launcher2/Launcher.java')
| -rw-r--r-- | src/com/android/launcher2/Launcher.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index 63982ba30..e2bddde82 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -330,7 +330,7 @@ public final class Launcher extends Activity // share the same customization workspace across all the tabs mCustomizePagedView = (CustomizePagedView) mInflater.inflate( - R.layout.customization_drawer, mHomeCustomizationDrawer, false); + R.layout.customization_drawer_tab_contents, mHomeCustomizationDrawer, false); TabContentFactory contentFactory = new TabContentFactory() { public View createTabContent(String tag) { return mCustomizePagedView; @@ -2738,6 +2738,9 @@ public final class Launcher extends Activity final int duration = toAllApps ? res.getInteger(R.integer.config_allAppsZoomInTime) : res.getInteger(R.integer.config_customizeZoomInTime); + final int fadeDuration = toAllApps ? + res.getInteger(R.integer.config_allAppsFadeInTime) : + res.getInteger(R.integer.config_customizeFadeInTime); final float scale = toAllApps ? (float) res.getInteger(R.integer.config_allAppsZoomScaleFactor) : @@ -2768,7 +2771,7 @@ public final class Launcher extends Activity if (toAllApps) { toView.setFastAlpha(0f); - ValueAnimator alphaAnim = ValueAnimator.ofFloat(0f, 1f).setDuration(duration); + ValueAnimator alphaAnim = ValueAnimator.ofFloat(0f, 1f).setDuration(fadeDuration); alphaAnim.setInterpolator(new DecelerateInterpolator(1.5f)); alphaAnim.addUpdateListener(new AnimatorUpdateListener() { public void onAnimationUpdate(ValueAnimator animation) { |