commit a915a917a2d80a076030cf90791d607cf67a250c
author Romain Guy <romainguy@google.com> Tue Oct 26 14:32:14 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 26 14:32:14 2010 -0700
tree 89011ab02b5484598c6de0a86ecd01a03962864f
parent 44ccb2ae8a56ee2b45f64369cd9e23a0d844e060
parent 3cf4c03125be60d56bff7eb82a1775ac46b919ed

Merge "Don't build bitmaps when running in GL."

src/com/android/launcher2/CellLayout.java

diff --git a/src/com/android/launcher2/CellLayout.java b/src/com/android/launcher2/CellLayout.java
index 9bb10fa..63da108 100644
--- a/src/com/android/launcher2/CellLayout.java
+++ b/src/com/android/launcher2/CellLayout.java
@@ -847,7 +847,9 @@
             final View view = getChildAt(i);
             view.setDrawingCacheEnabled(enabled);
             // Update the drawing caches
-            view.buildDrawingCache(true);
+            if (!view.isHardwareAccelerated()) {
+                view.buildDrawingCache(true);
+            }
         }
     }
 

src/com/android/launcher2/PagedViewCellLayout.java

diff --git a/src/com/android/launcher2/PagedViewCellLayout.java b/src/com/android/launcher2/PagedViewCellLayout.java
index 0a5a2ec..b779a97 100644
--- a/src/com/android/launcher2/PagedViewCellLayout.java
+++ b/src/com/android/launcher2/PagedViewCellLayout.java
@@ -250,7 +250,9 @@
             final View view = getChildAt(i);
             view.setDrawingCacheEnabled(enabled);
             // Update the drawing caches
-            view.buildDrawingCache(true);
+            if (!view.isHardwareAccelerated()) {
+                view.buildDrawingCache(true);
+            }
         }
     }