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

Commit 163e4cb0 authored by Kirill Grouchnikov's avatar Kirill Grouchnikov Committed by android-build-merger
Browse files

Merge "Tweak initialization order of LinearLayout's dividers" into oc-dev am: b07544cf 

am: 38b56107

Change-Id: I37bbff45bd309ce847f2797cb0ea96f114e81dad
parents 226ae10c 38b56107

core/java/android/widget/LinearLayout.java

+1 −1
Original line number Diff line number Diff line
@@ -258,9 +258,9 @@ public class LinearLayout extends ViewGroup { 


        mUseLargestChild = a.getBoolean(R.styleable.LinearLayout_measureWithLargestChild, false);



        setDividerDrawable(a.getDrawable(R.styleable.LinearLayout_divider));

        mShowDividers = a.getInt(R.styleable.LinearLayout_showDividers, SHOW_DIVIDER_NONE);

        mDividerPadding = a.getDimensionPixelSize(R.styleable.LinearLayout_dividerPadding, 0);

        setDividerDrawable(a.getDrawable(R.styleable.LinearLayout_divider));



        final int version = context.getApplicationInfo().targetSdkVersion;

        mAllowInconsistentMeasurement = version <= Build.VERSION_CODES.M;