Switched to tabbed version of AllApps2D on xlarge screens.

- add a temporary new zoom animation for all apps
- modify AllApps2D to allow it to be transparent
- other changes to dismiss the customization drawer when appropriate

Change-Id: I5660ab77f256ded299c1721c589983a1b30d56a4

1 files changed, 38 insertions, 35 deletions

diff --git a/res/layout-xlarge/launcher.xml b/res/layout-xlarge/launcher.xml
index 72cd7962f..61457bf0f 100644
--- a/res/layout-xlarge/launcher.xml
+++ b/res/layout-xlarge/launcher.xml
@@ -22,7 +22,12 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <include layout="@layout/all_apps" />
+    <include
+        layout="@layout/all_apps_tabbed"
+        android:id="@+id/all_apps_view"
+        android:layout_width="match_parent"
+        android:layout_height="500dip"
+        android:layout_gravity="top"/>
 
     <!-- The workspace contains 5 screens of cells -->
     <com.android.launcher2.Workspace
@@ -39,8 +44,6 @@
         <include android:id="@+id/cell5" layout="@layout/workspace_screen" />
     </com.android.launcher2.Workspace>
 
-
-
     <RelativeLayout
         android:id="@+id/all_apps_button_cluster"
         android:layout_width="wrap_content"
@@ -86,37 +89,37 @@
         android:layout_height="200dip"
         android:layout_gravity="bottom"
         android:visibility="gone">
-      <LinearLayout
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-         <TabWidget
-           android:id="@android:id/tabs"
-           android:layout_width="match_parent"
-           android:layout_height="wrap_content" />
-         <FrameLayout
-           android:id="@android:id/tabcontent"
-           android:background="#ff000000"
-           android:layout_width="match_parent"
-           android:layout_height="match_parent">
-           <com.android.launcher2.WidgetChooser
-             android:id="@+id/widget_chooser"
-             android:layout_width="match_parent"
-             android:layout_height="match_parent" />
-           <com.android.launcher2.FolderChooser
-             android:id="@+id/folder_chooser"
-             android:layout_width="match_parent"
-             android:layout_height="match_parent" />
-           <com.android.launcher2.ShortcutChooser
-             android:id="@+id/shortcut_chooser"
-             android:layout_width="match_parent"
-             android:layout_height="match_parent" />
-           <TextView
-             android:id="@+id/wallpaperstab"
-             android:layout_width="match_parent"
-             android:layout_height="match_parent"
-             android:text="@string/wallpapers_temp_tab_text" />
-          </FrameLayout>
-        </LinearLayout>
+        <LinearLayout
+            android:orientation="vertical"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+            <TabWidget
+                android:id="@android:id/tabs"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+            <FrameLayout
+                android:id="@android:id/tabcontent"
+                android:background="#ff000000"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+                <com.android.launcher2.WidgetChooser
+                    android:id="@+id/widget_chooser"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent" />
+                    <com.android.launcher2.FolderChooser
+                        android:id="@+id/folder_chooser"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent" />
+                    <com.android.launcher2.ShortcutChooser
+                        android:id="@+id/shortcut_chooser"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent" />
+                    <TextView
+                        android:id="@+id/wallpaperstab"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:text="@string/wallpapers_temp_tab_text" />
+             </FrameLayout>
+          </LinearLayout>
     </TabHost>
 </com.android.launcher2.DragLayer>