Change the way 2D/3D AllApps are selected.
all_apps.xml is now a trampoline that loads the correct layout file.
Also take this opportunity to make 2D the default.
Change-Id: Iba2500da1bf4f505f1a5c2f6f32ed6e72ec34c5f
diff --git a/res/layout/all_apps.xml b/res/layout/all_apps.xml
index 7975df4..fadf736 100644
--- a/res/layout/all_apps.xml
+++ b/res/layout/all_apps.xml
@@ -14,20 +14,7 @@
limitations under the License.
-->
-<!-- Replace with AllAppsView to use 2D version -->
-<com.android.launcher2.AllApps3D
- xmlns:android="http://schemas.android.com/apk/res/android"
-
- android:id="@+id/all_apps_view"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
-
- android:scrollbarStyle="outsideInset"
- android:drawSelectorOnTop="false"
- android:listSelector="@drawable/grid_selector"
- android:verticalSpacing="10dip"
- android:numColumns="4"
- android:fadingEdgeLength="20dip"
- android:padding="2dip"
- android:cacheColorHint="#FF000000"
- />
+<!-- switch to all_apps_3d on devices that support RenderScript -->
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+ <include layout="@layout/all_apps_2d" />
+</merge>