Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 638f17c1 authored Sep 29, 2011 by Romain Guy Committed by Android (Google) Code Review Sep 29, 2011

Merge "TextureView works best when it draws stuff. Bug #5391188"

parents 966222ef 59c7f80d

core/java/android/view/TextureView.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -250,6 +250,11 @@ public class TextureView extends View {
		return LAYER_TYPE_HARDWARE;
		}

		@Override
		boolean hasStaticLayer() {
		return true;
		}

		/**
		* Calling this method has no effect.
		*/

core/java/android/view/View.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -10000,6 +10000,15 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal
		invalidate(true);
		}

		/**
		* Indicates whether this view has a static layer. A view with layer type
		* {@link #LAYER_TYPE_NONE} is a static layer. Other types of layers are
		* dynamic.
		*/
		boolean hasStaticLayer() {
		return mLayerType == LAYER_TYPE_NONE;
		}

		/**
		* Indicates what type of layer is currently associated with this view. By default
		* a view does not have a layer, and the layer type is {@link #LAYER_TYPE_NONE}.

core/java/android/view/ViewGroup.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -2560,8 +2560,8 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
		final View[] children = mChildren;
		for (int i = 0; i < count; i++) {
		final View child = children[i];
		if (((child.mViewFlags & VISIBILITY_MASK) == VISIBLE \|\|
		child.getAnimation() != null) && child.getLayerType() == LAYER_TYPE_NONE) {
		if (((child.mViewFlags & VISIBILITY_MASK) == VISIBLE \|\| child.getAnimation() != null) &&
		child.hasStaticLayer()) {
		child.mRecreateDisplayList = (child.mPrivateFlags & INVALIDATED) == INVALIDATED;
		child.mPrivateFlags &= ~INVALIDATED;
		child.getDisplayList();

libs/hwui/TextDropShadowCache.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -81,7 +81,7 @@ struct ShadowText {
		LTE_INT(flags) {
		LTE_INT(italicStyle) {
		LTE_INT(scaleX) {
		return strncmp16(text, rhs.text, len >> 1) < 0;
		return memcmp(text, rhs.text, len) < 0;
		}
		}
		}