Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
58f1a59ab2
2 changed files with 9 additions and 0 deletions
|
@ -15,6 +15,9 @@ public class ExpandableButton extends Button {
|
|||
if(attrs != null) {
|
||||
TypedArray ar = context.obtainStyledAttributes(attrs, R.styleable.ExpandableView);
|
||||
maxWidth = ar.getDimension(R.styleable.ExpandableView_maxVisibleWidth, 0);
|
||||
if (ar != null) {
|
||||
ar.recycle();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -23,6 +26,9 @@ public class ExpandableButton extends Button {
|
|||
if(attrs != null) {
|
||||
TypedArray ar = context.obtainStyledAttributes(attrs, R.styleable.ExpandableView);
|
||||
maxWidth = ar.getDimension(R.styleable.ExpandableView_maxVisibleWidth, 0);
|
||||
if (ar != null) {
|
||||
ar.recycle();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -15,6 +15,9 @@ public class ExpandableLinearLayout extends LinearLayout {
|
|||
if(attrs != null) {
|
||||
TypedArray ar = context.obtainStyledAttributes(attrs, R.styleable.ExpandableView);
|
||||
maxWidth = ar.getDimension(R.styleable.ExpandableView_maxVisibleWidth, 0);
|
||||
if (ar != null) {
|
||||
ar.recycle();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue