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

3 files changed, 1 insertions, 16 deletions

diff --git a/core/java/android/view/TextureView.java b/core/java/android/view/TextureView.java
index ad34f02..6db46e9 100644
--- a/core/java/android/view/TextureView.java
+++ b/core/java/android/view/TextureView.java
@@ -284,11 +284,6 @@ public class TextureView extends View {
         return LAYER_TYPE_HARDWARE;
     }
 
-    @Override
-    boolean hasStaticLayer() {
-        return true;
-    }
-
     /**
      * Calling this method has no effect.
      */
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index fa74797..e8fc15e 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -14373,15 +14373,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}.
      * Refer to the documentation of {@link #setLayerType(int, android.graphics.Paint)}
diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java
index 4324e75..d0d4201 100644
--- a/core/java/android/view/ViewGroup.java
+++ b/core/java/android/view/ViewGroup.java
@@ -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);
             }
         }