commit e9d5d1ba4479d7b37cc53fef6768c89afb0a85ae
author Mike Cleron <mcleron@google.com> Mon Oct 19 17:25:07 2009 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Oct 19 17:25:07 2009 -0700
tree a916a572ff0e7d3272d600d5e327e2082981baf3
parent 05d4de503f6e8fa6373a8c89f8be214b4c2a8ae4
parent b6082fa019937c13e19b023cc3feb7fca14a62ab

am b6082fa0: Fix trackball selection on the desktop (not all apps, yet) AllApps view is always visible (in the View sense), which was causing it to take focus when it should not have. Changed Launcher to manually turn on/off the focusability of AllApps as it appears/d

Merge commit 'b6082fa019937c13e19b023cc3feb7fca14a62ab' into eclair-mr2

* commit 'b6082fa019937c13e19b023cc3feb7fca14a62ab':
  Fix trackball selection on the desktop (not all apps, yet)

src/com/android/launcher2/AllAppsView.java

diff --git a/src/com/android/launcher2/AllAppsView.java b/src/com/android/launcher2/AllAppsView.java
index 7ee3026..305f404 100644
--- a/src/com/android/launcher2/AllAppsView.java
+++ b/src/com/android/launcher2/AllAppsView.java
@@ -374,6 +374,7 @@
         return mRollo.mMessageProc.mZoom > 0.001f;
     }
 
+    /*
     @Override
     public boolean onTrackballEvent(MotionEvent ev)
     {
@@ -386,6 +387,7 @@
 
         return true;
     }
+    */
 
     public void setApps(ArrayList<ApplicationInfo> list) {
         mAllAppsList = list;

src/com/android/launcher2/Launcher.java

diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index bddc9ac..8516366 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -529,6 +529,8 @@
         mAllAppsGrid.setLauncher(this);
         mAllAppsGrid.setDragController(dragController);
         mAllAppsGrid.setWillNotDraw(false); // We don't want a hole punched in our window.
+        // Manage focusability manually since this thing is always visible
+        mAllAppsGrid.setFocusable(false); 
 
         mWorkspace = (Workspace) dragLayer.findViewById(R.id.workspace);
         final Workspace workspace = mWorkspace;
@@ -1611,6 +1613,8 @@
         mAllAppsGrid.zoom(1.0f);
         //mWorkspace.hide();
 
+        mAllAppsGrid.setFocusable(true);
+        
         // TODO: fade these two too
         mDeleteZone.setVisibility(View.GONE);
         //mHandleView.setVisibility(View.GONE);
@@ -1619,8 +1623,10 @@
     void closeAllApps(boolean animated) {
         if (mAllAppsGrid.isVisible()) {
             mAllAppsGrid.zoom(0.0f);
+            mAllAppsGrid.setFocusable(false);
             mWorkspace.getChildAt(mWorkspace.getCurrentScreen()).requestFocus();
 
+
             // TODO: fade these two too
             /*
             mDeleteZone.setVisibility(View.VISIBLE);