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

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

am 50d4de21: Merge "Fix bug with display lists and layout." into honeycomb 

* commit '50d4de21':
  Fix bug with display lists and layout.
parents 191f8ff3 50d4de21

core/java/android/view/View.java

+2 −0
Original line number Original line Diff line number Diff line
@@ -10288,6 +10288,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility 
        }

        }





        mPrivateFlags |= FORCE_LAYOUT;

        mPrivateFlags |= FORCE_LAYOUT;

        mPrivateFlags |= INVALIDATED;





        if (mParent != null && !mParent.isLayoutRequested()) {

        if (mParent != null && !mParent.isLayoutRequested()) {

            mParent.requestLayout();

            mParent.requestLayout();
@@ -10301,6 +10302,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility 
     */

     */

    public void forceLayout() {

    public void forceLayout() {

        mPrivateFlags |= FORCE_LAYOUT;

        mPrivateFlags |= FORCE_LAYOUT;

        mPrivateFlags |= INVALIDATED;

    }

    }





    /**

    /**