diff options
| -rw-r--r-- | core/java/android/view/HardwareRenderer.java | 9 | ||||
| -rw-r--r-- | core/java/android/view/ViewGroup.java | 2 |
2 files changed, 5 insertions, 6 deletions
diff --git a/core/java/android/view/HardwareRenderer.java b/core/java/android/view/HardwareRenderer.java index 267160dce945..14a77b40415f 100644 --- a/core/java/android/view/HardwareRenderer.java +++ b/core/java/android/view/HardwareRenderer.java @@ -75,7 +75,6 @@ public abstract class HardwareRenderer { * System property used to debug EGL configuration choice. * * Possible values: - * "false", don't print the configuration * "choice", print the chosen configuration only * "all", print all possible configurations */ @@ -501,6 +500,8 @@ public abstract class HardwareRenderer { abstract GLES20Canvas createCanvas(); + abstract int[] getConfig(boolean dirtyRegions); + void initializeEgl() { synchronized (sEglLock) { if (sEgl == null && sEglConfig == null) { @@ -552,7 +553,7 @@ public abstract class HardwareRenderer { int[] configSpec = getConfig(sDirtyRegions); // Debug - final String debug = SystemProperties.get(PRINT_CONFIG_PROPERTY, "false"); + final String debug = SystemProperties.get(PRINT_CONFIG_PROPERTY, ""); if ("all".equalsIgnoreCase(debug)) { sEgl.eglChooseConfig(sEglDisplay, configSpec, null, 0, configsCount); @@ -602,11 +603,9 @@ public abstract class HardwareRenderer { Log.d(LOG_TAG, " STENCIL_SIZE = " + value[0]); sEgl.eglGetConfigAttrib(sEglDisplay, config, EGL_SURFACE_TYPE, value); - Log.d(LOG_TAG, " SURFACE_TYPE = " + value[0]); + Log.d(LOG_TAG, " SURFACE_TYPE = 0x" + Integer.toHexString(value[0])); } - abstract int[] getConfig(boolean dirtyRegions); - GL createEglSurface(SurfaceHolder holder) throws Surface.OutOfResourcesException { // Check preconditions. if (sEgl == null) { diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java index 6f909713e4c1..8cf03a67a6cd 100644 --- a/core/java/android/view/ViewGroup.java +++ b/core/java/android/view/ViewGroup.java @@ -2854,7 +2854,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager // display lists to render, force an invalidate to allow the animation to // continue drawing another frame invalidate(true); - if (a.hasAlpha()) { + if (a.hasAlpha() && (child.mPrivateFlags & ALPHA_SET) == ALPHA_SET) { // alpha animations should cause the child to recreate its display list child.invalidate(true); } |