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

Commit c6b0589b authored by Chet Haase's avatar Chet Haase Committed by Android Git Automerger
Browse files

am 15c9e15e: am b9604a34: Merge "Amend getOverlay() docs for... 

am 15c9e15e: am b9604a34: Merge "Amend getOverlay() docs for SurfaceView/TextureView" into jb-mr2-dev

* commit '15c9e15e':
  Amend getOverlay() docs for SurfaceView/TextureView
parents 1b4e91df 15c9e15e

core/java/android/view/View.java

+4 −0
Original line number Diff line number Diff line
@@ -14063,6 +14063,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

+4 −0
Original line number Diff line number Diff line
@@ -2985,6 +2985,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

     */