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

Commit e2f126cc authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change I611cd3f4 

* changes:
  Fixes layout shifts in LinearLayout.
parents 3beb2fa4 611cd3f4

core/java/android/widget/LinearLayout.java

+6 −0
Original line number Diff line number Diff line
@@ -991,6 +991,9 @@ public class LinearLayout extends ViewGroup { 
                    case Gravity.RIGHT:

                        childLeft = childRight - childWidth - lp.rightMargin;

                        break;

                    default:

                        childLeft = paddingLeft;

                        break;

                }
@@ -1102,6 +1105,9 @@ public class LinearLayout extends ViewGroup { 
                            childTop -= (maxDescent[INDEX_BOTTOM] - descent);

                        }

                        break;

                    default:

                        childTop = paddingTop;

                        break;

                }



                childLeft += lp.leftMargin;