Determine # of rows/columns based on screen size
Change-Id: I8b1266bd7a66d4a73d4a09570357688333e03d13
diff --git a/res/layout-large/launcher.xml b/res/layout-large/launcher.xml
index 6c6fecf..6a16eb5 100644
--- a/res/layout-large/launcher.xml
+++ b/res/layout-large/launcher.xml
@@ -23,24 +23,10 @@
android:layout_height="match_parent"
android:focusable="false">
- <!-- The workspace contains 5 screens of cells -->
- <com.android.launcher2.Workspace
+ <include layout="@layout/workspace"
android:id="@+id/workspace"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:paddingTop="?android:attr/actionBarSize"
- android:paddingBottom="10dp"
- launcher:defaultScreen="2"
- launcher:cellCountX="8"
- launcher:cellCountY="7"
- launcher:pageSpacing="@dimen/workspace_page_spacing">
-
- <include android:id="@+id/cell1" layout="@layout/workspace_screen" />
- <include android:id="@+id/cell2" layout="@layout/workspace_screen" />
- <include android:id="@+id/cell3" layout="@layout/workspace_screen" />
- <include android:id="@+id/cell4" layout="@layout/workspace_screen" />
- <include android:id="@+id/cell5" layout="@layout/workspace_screen" />
- </com.android.launcher2.Workspace>
+ android:layout_height="match_parent" />
<include layout="@layout/button_bar"
android:id="@+id/all_apps_button_cluster"
@@ -48,8 +34,7 @@
android:layout_height="?android:attr/actionBarSize"
android:layout_gravity="top" />
- <include
- layout="@layout/all_apps_tabbed"
+ <include layout="@layout/all_apps_tabbed"
android:id="@+id/all_apps_view"
android:layout_width="match_parent"
android:layout_height="match_parent"