commit 5a808358f1a773dab8babae44899ffd4ed1810c1
author Winson Chung <winsonc@google.com> Mon Jun 27 19:08:49 2011 -0700
committer Winson Chung <winsonc@google.com> Mon Jul 25 13:48:59 2011 -0700
tree 51da799b228afea0af7fad593b6f6899fb3c0ab4
parent a22194bd9ff845775f91bff719322aba2522d32c

Adding menu to jump to shortcuts page in widgets tab

- Fixing bug in PagedView when setting the current page
- Fixing small visual issue with flashing scroll indicator
- Fixing slightly offset holographic icons

Change-Id: Ic6ce6365daca41cb5a73706c7c4b078f33a4e39c

src/com/android/launcher2/Launcher.java

diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index ae301c6..795d5cc 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -2088,7 +2088,7 @@
             alphaAnim.start();
 
             if (toView instanceof LauncherTransitionable) {
-                ((LauncherTransitionable) toView).onLauncherTransitionStart(scaleAnim);
+                ((LauncherTransitionable) toView).onLauncherTransitionStart(scaleAnim, false);
             }
             scaleAnim.addListener(new AnimatorListenerAdapter() {
                 @Override
@@ -2107,7 +2107,7 @@
                     toView.setScaleX(1.0f);
                     toView.setScaleY(1.0f);
                     if (toView instanceof LauncherTransitionable) {
-                        ((LauncherTransitionable) toView).onLauncherTransitionEnd(scaleAnim);
+                        ((LauncherTransitionable) toView).onLauncherTransitionEnd(scaleAnim, false);
                     }
 
                     if (!springLoaded && !LauncherApplication.isScreenLarge()) {
@@ -2132,8 +2132,8 @@
             toView.setVisibility(View.VISIBLE);
             toView.bringToFront();
             if (toView instanceof LauncherTransitionable) {
-                ((LauncherTransitionable) toView).onLauncherTransitionStart(null);
-                ((LauncherTransitionable) toView).onLauncherTransitionEnd(null);
+                ((LauncherTransitionable) toView).onLauncherTransitionStart(null, false);
+                ((LauncherTransitionable) toView).onLauncherTransitionEnd(null, false);
 
                 if (!springLoaded && !LauncherApplication.isScreenLarge()) {
                     // Hide the workspace scrollbar
@@ -2188,22 +2188,16 @@
                 }
             });
             if (fromView instanceof LauncherTransitionable) {
-                ((LauncherTransitionable) fromView).onLauncherTransitionStart(alphaAnim);
+                ((LauncherTransitionable) fromView).onLauncherTransitionStart(alphaAnim, true);
             }
             alphaAnim.addListener(new AnimatorListenerAdapter() {
                 @Override
-                public void onAnimationStart(android.animation.Animator animation) {
-                    if (!springLoaded && !LauncherApplication.isScreenLarge()) {
-                        // Show the workspace scrollbar
-                        mWorkspace.flashScrollingIndicator();
-                    }
-                }
-                @Override
                 public void onAnimationEnd(Animator animation) {
                     fromView.setVisibility(View.GONE);
                     if (fromView instanceof LauncherTransitionable) {
-                        ((LauncherTransitionable) fromView).onLauncherTransitionEnd(alphaAnim);
+                        ((LauncherTransitionable) fromView).onLauncherTransitionEnd(alphaAnim,true);
                     }
+                    mWorkspace.flashScrollingIndicator();
                 }
             });
 
@@ -2212,8 +2206,8 @@
         } else {
             fromView.setVisibility(View.GONE);
             if (fromView instanceof LauncherTransitionable) {
-                ((LauncherTransitionable) fromView).onLauncherTransitionStart(null);
-                ((LauncherTransitionable) fromView).onLauncherTransitionEnd(null);
+                ((LauncherTransitionable) fromView).onLauncherTransitionStart(null, true);
+                ((LauncherTransitionable) fromView).onLauncherTransitionEnd(null, true);
 
                 if (!springLoaded && !LauncherApplication.isScreenLarge()) {
                     // Flash the workspace scrollbar
@@ -2565,7 +2559,6 @@
 
             final AlertDialog.Builder builder = new AlertDialog.Builder(Launcher.this, 
                     AlertDialog.THEME_HOLO_DARK);
-            builder.setTitle(getString(R.string.menu_item_add_item));
             builder.setAdapter(mAdapter, this);
 
             AlertDialog dialog = builder.create();
@@ -2604,7 +2597,7 @@
             switch (item.actionTag) {
                 case AddAdapter.ITEM_SHORTCUT: {
                     if (mAppsCustomizeTabHost != null) {
-                        mAppsCustomizeTabHost.selectWidgetsTab();
+                        mAppsCustomizeTabHost.selectShortcutsTab();
                     }
                     showAllApps(true);
                     break;
@@ -2991,6 +2984,6 @@
 }
 
 interface LauncherTransitionable {
-    void onLauncherTransitionStart(Animator animation);
-    void onLauncherTransitionEnd(Animator animation);
+    void onLauncherTransitionStart(Animator animation, boolean toWorkspace);
+    void onLauncherTransitionEnd(Animator animation, boolean toWorkspace);
 }