From 3218a4e4f548a26e5783d3a56d150f07deeca448 Mon Sep 17 00:00:00 2001 From: Kirill Grouchnikov Date: Wed, 26 Apr 2017 17:45:28 -0400 Subject: Tweak initialization order of LinearLayout's dividers In ag/969570 we've unified the treatment of divider logic in LinearLayout. However, setDividerDrawable logic that was calling setWillNotDraw added condition that the divider position is not NONE. That made the initial flow effectively not calling setWillNotDraw(false). Changing the order to call setDividerDrawable() at the end invokes the right logic. Test: adb shell am instrument -e class 'android.widget.cts.LinearLayoutTest' -w 'android.widget.cts/android.support.test.runner.AndroidJUnitRunner' Bug: 37698004 Change-Id: I8d95770b9f48277c402708fbc5279ba2ec56719f --- core/java/android/widget/LinearLayout.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/java/android/widget/LinearLayout.java b/core/java/android/widget/LinearLayout.java index 544e591158cf..99f970027467 100644 --- a/core/java/android/widget/LinearLayout.java +++ b/core/java/android/widget/LinearLayout.java @@ -235,9 +235,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; -- cgit v1.2.3-59-g8ed1b