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

Commit c352090c authored by Romain Guy's avatar Romain Guy
Browse files

Correctly handle negative margins in horizontal linear layouts. 

When LinearLayout is measured in EXACTLY mode, we handle the negative margins
a bit differently. This is to support the use case of the current tab design.
parent 2299a553

core/java/android/widget/LinearLayout.java

+33 −7
Original line number Diff line number Diff line
@@ -633,6 +633,8 @@ public class LinearLayout extends ViewGroup { 
        final boolean baselineAligned = mBaselineAligned;

        final boolean useLargestChild = mUseLargestChild;

        

        final boolean isExactly = widthMode == MeasureSpec.EXACTLY;



        int largestChildWidth = Integer.MIN_VALUE;



        // See how wide everyone is. Also remember max height.
@@ -658,7 +660,13 @@ public class LinearLayout extends ViewGroup { 
                // Optimization: don't bother measuring children who are going to use

                // leftover space. These views will get measured again down below if

                // there is any leftover space.

                if (isExactly) {

                    mTotalLength += lp.leftMargin + lp.rightMargin;

                } else {

                    final int totalLength = mTotalLength;

                    mTotalLength = Math.max(totalLength, totalLength +

                            lp.leftMargin + lp.rightMargin);

                }



                // Baseline alignment requires to measure widgets to obtain the

                // baseline offset (in particular for TextViews). The following
@@ -694,8 +702,14 @@ public class LinearLayout extends ViewGroup { 
                }



                final int childWidth = child.getMeasuredWidth();

                if (isExactly) {

                    mTotalLength += childWidth + lp.leftMargin + lp.rightMargin +

                            getNextLocationOffset(child);

                } else {

                    final int totalLength = mTotalLength;

                    mTotalLength = Math.max(totalLength, totalLength + childWidth + lp.leftMargin +

                           lp.rightMargin + getNextLocationOffset(child));

                }



                if (useLargestChild) {

                    largestChildWidth = Math.max(childWidth, largestChildWidth);
@@ -780,8 +794,14 @@ public class LinearLayout extends ViewGroup { 


                final LinearLayout.LayoutParams lp = (LinearLayout.LayoutParams)

                        child.getLayoutParams();

                if (isExactly) {

                    mTotalLength += largestChildWidth + lp.leftMargin + lp.rightMargin +

                            getNextLocationOffset(child);

                } else {

                    final int totalLength = mTotalLength;

                    mTotalLength = Math.max(totalLength, totalLength + largestChildWidth +

                            lp.leftMargin + lp.rightMargin + getNextLocationOffset(child));

                }

            }

        }
@@ -851,8 +871,14 @@ public class LinearLayout extends ViewGroup { 
                    }

                }



                if (isExactly) {

                    mTotalLength += child.getMeasuredWidth() + lp.leftMargin + lp.rightMargin +

                            getNextLocationOffset(child);

                } else {

                    final int totalLength = mTotalLength;

                    mTotalLength = Math.max(totalLength, totalLength + child.getMeasuredWidth() +

                            lp.leftMargin + lp.rightMargin + getNextLocationOffset(child));

                }



                boolean matchHeightLocally = heightMode != MeasureSpec.EXACTLY &&

                        lp.height == LayoutParams.MATCH_PARENT;