diff options
| author | Kirill Grouchnikov <kirillg@google.com> | 2017-04-28 13:56:22 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-04-28 13:56:28 +0000 |
| commit | b07544cf69fef37ff3fbb636dca74dfd01ead8bb (patch) | |
| tree | 06c8de897acbc2699c98551add0d199eecfbe6ee /core/java/android/widget/LinearLayout.java | |
| parent | b8d4a9486713f6b14f8bde44c7c3831eeed1f16d (diff) | |
| parent | 3218a4e4f548a26e5783d3a56d150f07deeca448 (diff) | |
Merge "Tweak initialization order of LinearLayout's dividers" into oc-dev
Diffstat (limited to 'core/java/android/widget/LinearLayout.java')
| -rw-r--r-- | core/java/android/widget/LinearLayout.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/widget/LinearLayout.java b/core/java/android/widget/LinearLayout.java index ff3c85c99f53..88c3c5b6101e 100644 --- a/core/java/android/widget/LinearLayout.java +++ b/core/java/android/widget/LinearLayout.java @@ -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; |