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

* commit 'b77a7551121561f4ea7d5ce0c4030aeb7ce709e8':
  Remove View:hasStaticLayer()
This commit is contained in:
John Reck
2015-04-29 14:59:23 +00:00
committed by Android Git Automerger
3 changed files with 1 additions and 16 deletions

View File

@@ -284,11 +284,6 @@ public class TextureView extends View {
return LAYER_TYPE_HARDWARE;
}
@Override
boolean hasStaticLayer() {
return true;
}
/**
* Calling this method has no effect.
*/

View File

@@ -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}.

View File

@@ -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);
}
}