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

Commit 6c921033 authored Apr 29, 2015 by John Reck Committed by Android Git Automerger Apr 29, 2015

am b77a7551: Merge "Remove View:hasStaticLayer()" into mnc-dev

* commit 'b77a7551':
  Remove View:hasStaticLayer()

parents 6b960a9e b77a7551

core/java/android/view/TextureView.java

+0 −5

Original line number	Diff line number	Diff line
		@@ -284,11 +284,6 @@ 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

+0 −9

Original line number	Diff line number	Diff line
		@@ -14372,15 +14372,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		}
		}

		/**
		* 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 true;
		}

		/**
		* 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

+1 −2

Original line number	Diff line number	Diff line
		@@ -3505,8 +3505,7 @@ 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.hasStaticLayer()) {
		if (((child.mViewFlags & VISIBILITY_MASK) == VISIBLE \|\| child.getAnimation() != null)) {
		recreateChildDisplayList(child);
		}
		}