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

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

am e4d5c881: am 5f25f7c3: Merge "Perform layout and invalidation after... 

am e4d5c881: am 5f25f7c3: Merge "Perform layout and invalidation after bringChildToFront()" into klp-dev

* commit 'e4d5c881':
  Perform layout and invalidation after bringChildToFront()
parents 48bd2376 e4d5c881

core/java/android/view/View.java

+4 −2
Original line number Diff line number Diff line
@@ -8836,9 +8836,11 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
    /**

     * Change the view's z order in the tree, so it's on top of other sibling

     * views. This ordering change may affect layout, if the parent container

     * uses an order-dependent layout scheme (e.g., LinearLayout). This

     * uses an order-dependent layout scheme (e.g., LinearLayout). Prior

     * to {@link android.os.Build.VERSION_CODES#KEY_LIME_PIE} this

     * method should be followed by calls to {@link #requestLayout()} and

     * {@link View#invalidate()} on the parent.

     * {@link View#invalidate()} on the view's parent to force the parent to redraw

     * with the new child ordering.

     *

     * @see ViewGroup#bringChildToFront(View)

     */

core/java/android/view/ViewGroup.java

+2 −0
Original line number Diff line number Diff line
@@ -1123,6 +1123,8 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager 
            removeFromArray(index);

            addInArray(child, mChildrenCount);

            child.mParent = this;

            requestLayout();

            invalidate();

        }

    }

core/java/android/view/ViewParent.java

+4 −2
Original line number Diff line number Diff line
@@ -148,9 +148,11 @@ public interface ViewParent { 
    /**

     * Change the z order of the child so it's on top of all other children.

     * This ordering change may affect layout, if this container

     * uses an order-dependent layout scheme (e.g., LinearLayout). This

     * uses an order-dependent layout scheme (e.g., LinearLayout). Prior

     * to {@link android.os.Build.VERSION_CODES#KEY_LIME_PIE} this

     * method should be followed by calls to {@link #requestLayout()} and

     * {@link View#invalidate()} on this parent.

     * {@link View#invalidate()} on this parent to force the parent to redraw

     * with the new child ordering.

     * 

     * @param child The child to bring to the top of the z order

     */