Merge change I461073bb into eclair
* changes:
Fix exit animation of top icon when present.
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;
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);