commit ff5f040de1fd7a33759e8e4ce03c3ef68df174bb
author Patrick Dubroy <dubroy@google.com> Mon Jul 26 15:23:26 2010 -0700
committer Patrick Dubroy <dubroy@google.com> Mon Jul 26 15:23:42 2010 -0700
tree 5e9ca7d9db701272018802110eab865a48edeba6
parent 13f011e35299ed071ecfeb3573a95ddbae5285d3

isOpaque is not appropriate for AllAppsTabbed; replace with isAnimating().

src/com/android/launcher2/Launcher.java

diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index f846b51..37e7191 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -218,7 +218,6 @@
     private Drawable[] mHotseatIcons = null;
     private CharSequence[] mHotseatLabels = null;
 
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -1205,12 +1204,12 @@
 
         // If all apps is animating, don't show the menu, because we don't know
         // which one to show.
-        if (mAllAppsGrid.isVisible() && !mAllAppsGrid.isOpaque()) {
+        if (mAllAppsGrid.isAnimating()) {
             return false;
         }
 
         // Only show the add and wallpaper options when we're not in all apps.
-        boolean visible = !mAllAppsGrid.isOpaque();
+        boolean visible = !mAllAppsGrid.isVisible();
         menu.setGroupVisible(MENU_GROUP_ADD, visible);
         menu.setGroupVisible(MENU_GROUP_WALLPAPER, visible);