commit 4bb4f735c80ba6baca6678f6508b3862da61313a
author Michael Jurka <mikejurka@google.com> Wed Aug 04 18:46:01 2010 -0700
committer Michael Jurka <mikejurka@google.com> Fri Aug 06 11:19:47 2010 -0700
tree 3fdbcbcbbffc831f0c7432b462c990f0653e4fd2
parent e029ea7efc3e03e17e22be23b4c277fc426839ca

small fixes to Launcher

- more robust unshrink animation
- catching a resource not found exception when
  making widget preview
- added more missing copyright headers
- hiding customization drawer when long press on widget
- long-pressing on widget is temporarily always
  springloaded to zoom in to workspace screen

Change-Id: I6c92877357e907d89840fecc4662f0700b96255b

src/com/android/launcher2/Launcher.java

diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 8557241..5a508ab 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -1040,7 +1040,6 @@
             }
             closeAllApps(alreadyOnHome && allAppsVisible);
             hideCustomizationDrawer();
-            mWorkspace.unshrink();
 
             final View v = getWindow().peekDecorView();
             if (v != null && v.getWindowToken() != null) {
@@ -1512,7 +1511,6 @@
             closeAllApps(true);
         } else if (isCustomizationDrawerVisible()) {
             hideCustomizationDrawer();
-            mWorkspace.unshrink();
         } else {
             closeFolder();
         }
@@ -1590,7 +1588,6 @@
         // this is an intercepted event being forwarded from mWorkspace;
         // clicking anywhere on the workspace causes the drawer to slide down
         hideCustomizationDrawer();
-        mWorkspace.unshrink();
         return false;
     }
 
@@ -2062,7 +2059,8 @@
     }
 
     void showAllApps(boolean animated) {
-        hideCustomizationDrawer();
+        boolean unshrinkWorkspace = false;
+        hideCustomizationDrawer(unshrinkWorkspace);
 
         if (LauncherApplication.isScreenXLarge()) {
             mWorkspace.shrinkToBottom(animated);
@@ -2213,7 +2211,11 @@
                 AnimationUtils.loadAnimation(this, R.anim.home_customization_drawer_slide_up));
     }
 
-    private void hideCustomizationDrawer() {
+    void hideCustomizationDrawer() {
+        hideCustomizationDrawer(true);
+    }
+
+    void hideCustomizationDrawer(boolean unshrinkWorkspace) {
         if (isCustomizationDrawerVisible()) {
             Animation slideDownAnimation = AnimationUtils.loadAnimation(
                     this, R.anim.home_customization_drawer_slide_down);
@@ -2225,6 +2227,9 @@
                 public void onAnimationStart(Animation animation) {}
             });
             mHomeCustomizationDrawer.startAnimation(slideDownAnimation);
+            if (unshrinkWorkspace) {
+                mWorkspace.unshrink();
+            }
         }
     }