commit 4e6a976c2d85f7261ae4318a9ccffd2440f73124
author Winson Chung <winsonc@google.com> Mon May 09 11:56:34 2011 -0700
committer Winson Chung <winsonc@google.com> Mon May 09 16:03:19 2011 -0700
tree fdb2e2b157974f2e5260cc02c56b80d7981ab4ca
parent 63257c110a4ee54d5e8872c471cce254cf613c7a

Adding keyboard focus support for phones.

Change-Id: I2daab961d0727bc5d892db6b50ad0f51fe23873c

src/com/android/launcher2/Launcher.java

diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index ceb36be..9b136c4 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -935,8 +935,11 @@
              hotseatRight.setContentDescription(mHotseatLabels[1]);
              hotseatRight.setImageDrawable(mHotseatIcons[1]);
 
+             View.OnKeyListener listener = new IndicatorKeyEventListener();
              mPreviousView = (ImageView) dragLayer.findViewById(R.id.previous_screen);
+             mPreviousView.setOnKeyListener(listener);
              mNextView = (ImageView) dragLayer.findViewById(R.id.next_screen);
+             mNextView.setOnKeyListener(listener);
 
              Drawable previous = mPreviousView.getDrawable();
              Drawable next = mNextView.getDrawable();
@@ -1009,7 +1012,14 @@
             dragController.addDropTarget(allAppsDeleteZone);
         }
         mButtonCluster = (ViewGroup) findViewById(R.id.all_apps_button_cluster);
-        View.OnKeyListener listener = new ButtonBarKeyEventListener();
+        View.OnKeyListener listener = null;
+        if (LauncherApplication.isScreenXLarge()) {
+            // For tablets, AllApps lives in the button bar at the top
+            listener = new ButtonBarKeyEventListener();
+        } else {
+            // For phones, AppsCustomize lives in the "dock" at the bottom
+            listener = new DockKeyEventListener();
+        }
         int buttonCount = mButtonCluster.getChildCount();
         for (int i = 0; i < buttonCount; ++i) {
             mButtonCluster.getChildAt(i).setOnKeyListener(listener);
@@ -2678,6 +2688,7 @@
             });
 
             if (toAllApps) {
+                toView.setVisibility(View.VISIBLE);
                 toView.setFastAlpha(0f);
                 ValueAnimator alphaAnim = ValueAnimator.ofFloat(0f, 1f).setDuration(fadeDuration);
                 alphaAnim.setInterpolator(new DecelerateInterpolator(1.5f));