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

Commit 38b56107 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

Change-Id: Icd96ecd6bc49c7c228a74e5322f79fc1ae4f42bc
parents 9b4511c6 b07544cf
Loading
Loading
Loading
Loading
+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;