From 53ca03d9a3a6a95286302802173c4820b16328ce Mon Sep 17 00:00:00 2001 From: Romain Guy Date: Fri, 8 Oct 2010 18:55:27 -0700 Subject: Don't set hwAccelerated=true when libhwui is not present. Change-Id: I6df5a89e4b4d94d76e96b5d0a678b7a8f646268a --- core/java/android/view/HardwareRenderer.java | 6 +++--- core/java/android/view/ViewRoot.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/java/android/view/HardwareRenderer.java b/core/java/android/view/HardwareRenderer.java index 3de79621db40..69bdef05e601 100644 --- a/core/java/android/view/HardwareRenderer.java +++ b/core/java/android/view/HardwareRenderer.java @@ -103,10 +103,10 @@ public abstract class HardwareRenderer { abstract void draw(View view, View.AttachInfo attachInfo, int yOffset); /** - * Creates a new canvas that can be used to record drawing operations - * in the specified display list. + * Creates a new display list that can be used to record batches of + * drawing operations. * - * @return A new recording canvas. + * @return A new display list. */ abstract DisplayList createDisplayList(); diff --git a/core/java/android/view/ViewRoot.java b/core/java/android/view/ViewRoot.java index 7907ad2cb25f..14a049c8b68a 100644 --- a/core/java/android/view/ViewRoot.java +++ b/core/java/android/view/ViewRoot.java @@ -472,7 +472,7 @@ public final class ViewRoot extends Handler implements ViewParent, View.AttachIn mAttachInfo.mHardwareRenderer.destroy(true); } mAttachInfo.mHardwareRenderer = HardwareRenderer.createGlRenderer(2, translucent); - mAttachInfo.mHardwareAccelerated = true; + mAttachInfo.mHardwareAccelerated = mAttachInfo.mHardwareRenderer != null; } } } -- cgit v1.2.3-59-g8ed1b