Merge "Amend getOverlay() docs for SurfaceView/TextureView" into jb-mr2-dev

core/java/android/view/View.java

@@ -14060,6 +14060,10 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
      * managed: remove them when they should not be displayed anymore. The
      * overlay will always have the same size as its host view.
      *
+     * <p>Note: Overlays do not currently work correctly with {@link
+     * SurfaceView} or {@link TextureView}; contents in overlays for these
+     * types of views may not display correctly.</p>
+     *
      * @return The ViewOverlay object for this view.
      * @see ViewOverlay
      */

core/java/android/view/ViewGroup.java

@@ -2975,6 +2975,10 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
      * representation of a view in a parent container, such as might be used
      * by an animation effect.
      *
+     * <p>Note: Overlays do not currently work correctly with {@link
+     * SurfaceView} or {@link TextureView}; contents in overlays for these
+     * types of views may not display correctly.</p>
+     *
      * @return The ViewGroupOverlay object for this view.
      * @see ViewGroupOverlay
      */