From 56901eb57c1f9a94170c892be70bb0f653514ce8 Mon Sep 17 00:00:00 2001
From: Adam Cohen <adamcohen@google.com>
Date: Mon, 25 Jul 2011 14:54:22 -0700
Subject: Turning off largeHeap on Crespo

Change-Id: I28dcd1db577688fe24c786f1519f442c690bff1d
---
 AndroidManifest.xml                      | 2 +-
 res/values-large/config.xml              | 2 ++
 res/values/config.xml                    | 1 +
 src/com/android/launcher2/Workspace.java | 1 -
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ace53eff5..8382977c3 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -68,7 +68,7 @@
         android:label="@string/application_name"
         android:icon="@drawable/ic_launcher_home"
         android:hardwareAccelerated="@bool/config_hardwareAccelerated"
-        android:largeHeap="true">
+        android:largeHeap="@bool/config_largeHeap">
         <activity
             android:name="com.android.launcher2.Launcher"
             android:launchMode="singleTask"
diff --git a/res/values-large/config.xml b/res/values-large/config.xml
index f0ce3481d..6274364e1 100644
--- a/res/values-large/config.xml
+++ b/res/values-large/config.xml
@@ -1,4 +1,6 @@
 <resources>
+    <bool name="config_largeHeap">true</bool>
+
 <!-- AllApps/Customize/AppsCustomize -->
     <!-- Out of 100, the percent to shrink the workspace during spring loaded mode. -->
     <integer name="config_workspaceSpringLoadShrinkPercentage">90</integer>
diff --git a/res/values/config.xml b/res/values/config.xml
index 5ddf0a113..9a2c1f27f 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -1,5 +1,6 @@
 <resources>
     <bool name="config_hardwareAccelerated">true</bool>
+    <bool name="config_largeHeap">false</bool>
 
 <!-- AllApps/Customize/AppsCustomize -->
     <!-- The alpha of the AppsCustomize bg in spring loaded mode -->
diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index 035d9ea4d..778dacd9e 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -3143,7 +3143,6 @@ public class Workspace extends SmoothPagedView
         mSpringLoadedDragController = new SpringLoadedDragController(mLauncher);
         mDragController = dragController;
 
-
         // hardware layers on children are enabled on startup, but should be disabled until
         // needed
         updateChildrenLayersEnabled();
-- 
cgit v1.2.3