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

Commit 8b88a850 authored by Yigit Boyar's avatar Yigit Boyar Committed by Android (Google) Code Review
Browse files

Merge "Fix generate layout params to preserve margins" into nyc-dev

parents 66d16f12 885c50b6

core/java/android/widget/FrameLayout.java

+8 −2
Original line number Diff line number Diff line
@@ -400,8 +400,14 @@ public class FrameLayout extends ViewGroup { 
    }



    @Override

    protected ViewGroup.LayoutParams generateLayoutParams(ViewGroup.LayoutParams p) {

        return new LayoutParams(p);

    protected ViewGroup.LayoutParams generateLayoutParams(ViewGroup.LayoutParams lp) {

        if (lp instanceof LayoutParams) {

            return new LayoutParams((LayoutParams) lp);

        } else if (lp instanceof MarginLayoutParams) {

            return new LayoutParams((MarginLayoutParams) lp);

        } else {

            return new LayoutParams(lp);

        }

    }



    @Override

core/java/android/widget/GridLayout.java

+8 −2
Original line number Diff line number Diff line
@@ -867,8 +867,14 @@ public class GridLayout extends ViewGroup { 
    }



    @Override

    protected LayoutParams generateLayoutParams(ViewGroup.LayoutParams p) {

        return new LayoutParams(p);

    protected LayoutParams generateLayoutParams(ViewGroup.LayoutParams lp) {

        if (lp instanceof LayoutParams) {

            return new LayoutParams((LayoutParams) lp);

        } else if (lp instanceof MarginLayoutParams) {

            return new LayoutParams((MarginLayoutParams) lp);

        } else {

            return new LayoutParams(lp);

        }

    }



    // Draw grid

core/java/android/widget/LinearLayout.java

+8 −2
Original line number Diff line number Diff line
@@ -1839,8 +1839,14 @@ public class LinearLayout extends ViewGroup { 
    }



    @Override

    protected LayoutParams generateLayoutParams(ViewGroup.LayoutParams p) {

        return new LayoutParams(p);

    protected LayoutParams generateLayoutParams(ViewGroup.LayoutParams lp) {

        if (lp instanceof LayoutParams) {

            return new LayoutParams((LayoutParams) lp);

        } else if (lp instanceof MarginLayoutParams) {

            return new LayoutParams((MarginLayoutParams) lp);

        } else {

            return new LayoutParams(lp);

        }

    }

core/java/android/widget/RelativeLayout.java

+8 −2
Original line number Diff line number Diff line
@@ -1103,8 +1103,14 @@ public class RelativeLayout extends ViewGroup { 
    }



    @Override

    protected ViewGroup.LayoutParams generateLayoutParams(ViewGroup.LayoutParams p) {

        return new LayoutParams(p);

    protected ViewGroup.LayoutParams generateLayoutParams(ViewGroup.LayoutParams lp) {

        if (lp instanceof LayoutParams) {

            return new LayoutParams((LayoutParams) lp);

        } else if (lp instanceof MarginLayoutParams) {

            return new LayoutParams((MarginLayoutParams) lp);

        } else {

            return new LayoutParams(lp);

        }

    }



    /** @hide */