From 73a0554de11ed880bfed3dafaa17f5c0d7b5b1fe Mon Sep 17 00:00:00 2001
From: Daniel Sandler <dsandler@google.com>
Date: Tue, 9 Mar 2010 14:45:57 -0500
Subject: Fix trackball focus weirdness in AllApps2D.

Also vertically align AllApps2D's home icon with Workspace's
grid icon.

Change-Id: I81a8759ed33afd08336482484f1b9bdb9a36718e
---
 res/layout/all_apps_2d.xml | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'res')

diff --git a/res/layout/all_apps_2d.xml b/res/layout/all_apps_2d.xml
index f22b8ea50..7bbfa91e7 100644
--- a/res/layout/all_apps_2d.xml
+++ b/res/layout/all_apps_2d.xml
@@ -22,8 +22,8 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:padding="2dip"
-    
     >
+
     <GridView android:id="@+id/all_apps_2d_grid"
         android:tag="all_apps_2d_grid"
         android:scrollbars="none"
@@ -36,20 +36,28 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_alignParentBottom="true"
-        android:layout_marginBottom="24dip"
+        android:layout_marginBottom="28dip"
         android:layout_marginTop="8dip"
         android:nextFocusDown="@+id/all_apps_2d_home"
+        android:nextFocusUp="@null"
+        android:nextFocusLeft="@null"
+        android:nextFocusRight="@null"
         />
 
-    <ImageButton android:id="@+id/all_apps_2d_home"
+    <view
+        class="com.android.launcher2.AllApps2D$HomeButton"
+        android:id="@+id/all_apps_2d_home"
         android:tag="all_apps_2d_home"
         android:src="@drawable/home_button"
         android:background="#00000000"
         android:layout_centerHorizontal="true"
         android:layout_alignParentBottom="true"
         android:layout_width="wrap_content"
-        android:layout_height="64dip"
+        android:layout_height="@dimen/button_bar_height"
         android:nextFocusUp="@+id/all_apps_2d_grid"
+        android:nextFocusDown="@null"
+        android:nextFocusLeft="@null"
+        android:nextFocusRight="@null"
         />
 
 </com.android.launcher2.AllApps2D>
-- 
cgit v1.2.3