Checkpoint launcher2 - all apps is in a 2nd window.

Lots is still broken.

4 files changed, 52 insertions, 42 deletions

diff --git a/res/layout-land/all_apps.xml b/res/layout-land/all_apps.xml
new file mode 100644
index 000000000..1927394ae
--- /dev/null
+++ b/res/layout-land/all_apps.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<com.android.launcher2.AllAppsGridView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher2"
+
+    android:id="@+id/all_apps"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+
+    launcher:texture="@drawable/pattern_carbon_fiber_dark"
+
+    android:scrollbarStyle="outsideInset"
+    android:drawSelectorOnTop="false"
+    android:listSelector="@drawable/grid_selector"
+
+    android:verticalSpacing="10dip"
+    android:numColumns="5" />
+
+<!--
+    android:nextFocusLeft="@id/all_apps"
+    android:nextFocusDown="@id/content"
+    android:nextFocusUp="@id/content"
+    android:nextFocusRight="@id/content"
+-->
+
+
diff --git a/res/layout-land/launcher.xml b/res/layout-land/launcher.xml
index 3af51ec55..ef1623101 100644
--- a/res/layout-land/launcher.xml
+++ b/res/layout-land/launcher.xml
@@ -36,51 +36,20 @@
 
     </com.android.launcher2.Workspace>
 
-    <SlidingDrawer
-        android:id="@+id/drawer"
-        android:layout_width="fill_parent"
+    <com.android.launcher2.HandleView
+        android:id="@id/all_apps"
+        android:layout_width="56dip"
         android:layout_height="fill_parent"
 
-        android:orientation="horizontal"
-        android:bottomOffset="7dip"
-        android:handle="@+id/all_apps"
-        android:content="@+id/content">
-        
-        <com.android.launcher2.HandleView
-            android:id="@id/all_apps"
-            android:layout_width="56dip"
-            android:layout_height="fill_parent"
-
-            android:background="@drawable/handle"
-
-            android:focusable="true"
-            android:clickable="true"
-
-            android:scaleType="center"
-            android:src="@drawable/handle_icon"
-
-            launcher:direction="vertical" />
+        android:background="@drawable/handle"
 
-        <com.android.launcher2.AllAppsGridView
-            android:id="@id/content"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
+        android:focusable="true"
+        android:clickable="true"
 
-            launcher:texture="@drawable/pattern_carbon_fiber_dark"
-
-            android:scrollbarStyle="outsideInset"
-            android:drawSelectorOnTop="false"
-            android:listSelector="@drawable/grid_selector"
-
-            android:nextFocusLeft="@id/all_apps"
-            android:nextFocusDown="@id/content"
-            android:nextFocusUp="@id/content"
-            android:nextFocusRight="@id/content"
-
-            android:verticalSpacing="10dip"
-            android:numColumns="5" />
+        android:scaleType="center"
+        android:src="@drawable/handle_icon"
 
-    </SlidingDrawer>
+        launcher:direction="vertical" />
 
     <com.android.launcher2.DeleteZone
         android:id="@+id/delete_zone"
diff --git a/res/layout-land/live_folder_grid.xml b/res/layout-land/live_folder_grid.xml
index 8905cf330..9a87628c7 100644
--- a/res/layout-land/live_folder_grid.xml
+++ b/res/layout-land/live_folder_grid.xml
@@ -31,7 +31,7 @@
     	android:layout_height="wrap_content" />
 
     <GridView
-        android:id="@id/content"
+        android:id="@+id/content"
         android:layout_width="fill_parent"
     	android:layout_height="0dip"
     	android:layout_weight="1"
diff --git a/res/layout-land/user_folder.xml b/res/layout-land/user_folder.xml
index b27c94b08..9d419f5e9 100644
--- a/res/layout-land/user_folder.xml
+++ b/res/layout-land/user_folder.xml
@@ -28,7 +28,7 @@
     	android:layout_height="wrap_content" />
 
     <GridView
-        android:id="@id/content"
+        android:id="@+id/content"
         android:layout_width="fill_parent"
     	android:layout_height="0dip"
     	android:layout_weight="1"