diff options
| author | Romain Guy <romainguy@google.com> | 2010-10-26 14:32:14 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-10-26 14:32:14 -0700 |
| commit | a915a917a2d80a076030cf90791d607cf67a250c (patch) | |
| tree | 89011ab02b5484598c6de0a86ecd01a03962864f /src/com | |
| parent | 44ccb2ae8a56ee2b45f64369cd9e23a0d844e060 (diff) | |
| parent | 3cf4c03125be60d56bff7eb82a1775ac46b919ed (diff) | |
| download | android_packages_apps_Trebuchet-a915a917a2d80a076030cf90791d607cf67a250c.tar.gz android_packages_apps_Trebuchet-a915a917a2d80a076030cf90791d607cf67a250c.tar.bz2 android_packages_apps_Trebuchet-a915a917a2d80a076030cf90791d607cf67a250c.zip | |
Merge "Don't build bitmaps when running in GL."
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/launcher2/CellLayout.java | 4 | ||||
| -rw-r--r-- | src/com/android/launcher2/PagedViewCellLayout.java | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/com/android/launcher2/CellLayout.java b/src/com/android/launcher2/CellLayout.java index 9bb10fab4..63da108d0 100644 --- a/src/com/android/launcher2/CellLayout.java +++ b/src/com/android/launcher2/CellLayout.java @@ -847,7 +847,9 @@ public class CellLayout extends ViewGroup implements Dimmable { final View view = getChildAt(i); view.setDrawingCacheEnabled(enabled); // Update the drawing caches - view.buildDrawingCache(true); + if (!view.isHardwareAccelerated()) { + view.buildDrawingCache(true); + } } } diff --git a/src/com/android/launcher2/PagedViewCellLayout.java b/src/com/android/launcher2/PagedViewCellLayout.java index 0a5a2ec29..b779a973d 100644 --- a/src/com/android/launcher2/PagedViewCellLayout.java +++ b/src/com/android/launcher2/PagedViewCellLayout.java @@ -250,7 +250,9 @@ public class PagedViewCellLayout extends ViewGroup { final View view = getChildAt(i); view.setDrawingCacheEnabled(enabled); // Update the drawing caches - view.buildDrawingCache(true); + if (!view.isHardwareAccelerated()) { + view.buildDrawingCache(true); + } } } |