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

Commit de8a90ce authored by Scott Main's avatar Scott Main Committed by Android (Google) Code Review
Browse files

Merge "cherrypick Change-Id: I213711f4b5d867ba91c961a2f098b6cc415cfcb3 docs:... 

Merge "cherrypick Change-Id: I213711f4b5d867ba91c961a2f098b6cc415cfcb3 docs: clarify framelayout class summary, issue 5055437"
parents 3c6c3ddb 812634c2

core/java/android/view/View.java

+7 −3
Original line number Diff line number Diff line
@@ -672,19 +672,23 @@ public class View implements Drawable.Callback2, KeyEvent.Callback, Accessibilit 
    private static final int FITS_SYSTEM_WINDOWS = 0x00000002;



    /**

     * This view is visible.  Use with {@link #setVisibility(int)}.

     * This view is visible.

     * Use with {@link #setVisibility} and <a href="#attr_android:visibility">{@code

     * android:visibility}.

     */

    public static final int VISIBLE = 0x00000000;



    /**

     * This view is invisible, but it still takes up space for layout purposes.

     * Use with {@link #setVisibility(int)}.

     * Use with {@link #setVisibility} and <a href="#attr_android:visibility">{@code

     * android:visibility}.

     */

    public static final int INVISIBLE = 0x00000004;



    /**

     * This view is invisible, and it doesn't take any space for layout

     * purposes. Use with {@link #setVisibility(int)}.

     * purposes. Use with {@link #setVisibility} and <a href="#attr_android:visibility">{@code

     * android:visibility}.

     */

    public static final int GONE = 0x00000008;

core/java/android/widget/FrameLayout.java

+11 −6
Original line number Diff line number Diff line
@@ -34,12 +34,17 @@ import android.widget.RemoteViews.RemoteView; 


/**

 * FrameLayout is designed to block out an area on the screen to display

 * a single item. You can add multiple children to a FrameLayout and control their

 * position within the FrameLayout using {@link android.widget.FrameLayout.LayoutParams#gravity}.

 * Children are drawn in a stack, with the most recently added child on top.

 * The size of the frame layout is the size of its largest child (plus padding), visible

 * or not (if the FrameLayout's parent permits). Views that are GONE are used for sizing

 * only if {@link #setMeasureAllChildren(boolean) setMeasureAllChildren()}

 * a single item. Generally, FrameLayout should be used to hold a single child view, because it can

 * be difficult to organize child views in a way that's scalable to different screen sizes without

 * the children overlapping each other. You can, however, add multiple children to a FrameLayout

 * and control their position within the FrameLayout by assigning gravity to each child, using the

 * <a href="FrameLayout.LayoutParams.html#attr_android:layout_gravity">{@code

 * android:layout_gravity}</a> attribute.

 * <p>Child views are drawn in a stack, with the most recently added child on top.

 * The size of the FrameLayout is the size of its largest child (plus padding), visible

 * or not (if the FrameLayout's parent permits). Views that are {@link android.view.View#GONE} are

 * used for sizing

 * only if {@link #setMeasureAllChildren(boolean) setConsiderGoneChildrenWhenMeasuring()}

 * is set to true.

 *

 * @attr ref android.R.styleable#FrameLayout_foreground