Move the all apps view back into the window with the workspace.

4 files changed, 16 insertions, 92 deletions

diff --git a/res/layout-land/all_apps.xml b/res/layout-land/all_apps.xml
deleted file mode 100644
index c53806221..000000000
--- a/res/layout-land/all_apps.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?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.AllAppsView
-    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"
-
-    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 ef1623101..fd27bade1 100644
--- a/res/layout-land/launcher.xml
+++ b/res/layout-land/launcher.xml
@@ -37,7 +37,7 @@
     </com.android.launcher2.Workspace>
 
     <com.android.launcher2.HandleView
-        android:id="@id/all_apps"
+        android:id="@+id/all_apps_button"
         android:layout_width="56dip"
         android:layout_height="fill_parent"
 
diff --git a/res/layout-port/all_apps.xml b/res/layout-port/all_apps.xml
deleted file mode 100644
index d1cbeeb5f..000000000
--- a/res/layout-port/all_apps.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?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.DragLayer
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher2"
-
-    android:id="@+id/drag_layer"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
-
-    <com.android.launcher2.AllAppsView
-        android:id="@+id/all_apps"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-
-        android:scrollbarStyle="outsideInset"
-        android:drawSelectorOnTop="false"
-        android:listSelector="@drawable/grid_selector"
-
-        android:verticalSpacing="10dip"
-        android:numColumns="4" />
-
-<!--
-    android:nextFocusLeft="@id/content"
-    android:nextFocusDown="@id/content"
-    android:nextFocusUp="@id/all_apps"
-    android:nextFocusRight="@id/content"
--->
-
-</com.android.launcher2.DragLayer>
diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml
index 273403e56..d57d3a4d7 100644
--- a/res/layout-port/launcher.xml
+++ b/res/layout-port/launcher.xml
@@ -14,18 +14,27 @@
      limitations under the License.
 -->
 
-<FrameLayout
+<com.android.launcher2.DragLayer
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher2"
 
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
-
-<com.android.launcher2.DragLayer
     android:id="@+id/drag_layer"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent">
 
+    <com.android.launcher2.AllAppsView
+        android:id="@+id/all_apps_view"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:visibility="gone"
+
+        android:scrollbarStyle="outsideInset"
+        android:drawSelectorOnTop="false"
+        android:listSelector="@drawable/grid_selector"
+
+        android:verticalSpacing="10dip"
+        android:numColumns="4" />
+
     <!-- The workspace contains 3 screens of cells -->
     <com.android.launcher2.Workspace
         android:id="@+id/workspace"
@@ -41,7 +50,7 @@
     </com.android.launcher2.Workspace>
 
     <com.android.launcher2.HandleView
-        android:id="@id/all_apps"
+        android:id="@+id/all_apps_button"
         android:layout_width="fill_parent"
         android:layout_height="56dip"
         android:layout_gravity="bottom"
@@ -71,5 +80,3 @@
         launcher:direction="horizontal" />
 
 </com.android.launcher2.DragLayer>
-
-</FrameLayout>