Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: b07544cf69

Change-Id: Icd96ecd6bc49c7c228a74e5322f79fc1ae4f42bc
This commit is contained in:
Kirill Grouchnikov
2017-04-28 14:01:21 +00:00
committed by android-build-merger
parent 9b4511c643 b07544cf69
commit 38b5610779
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/widget/LinearLayout.java
View File

@@ -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;