Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2017-01-06 20:04:17 +01:00
commit 58f1a59ab2
2 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
OsmAnd/src/net/osmand/view/ExpandableButton.java
View file

@ -15,6 +15,9 @@ public class ExpandableButton extends Button {
if(attrs != null) { if(attrs != null) {
TypedArray ar = context.obtainStyledAttributes(attrs, R.styleable.ExpandableView); TypedArray ar = context.obtainStyledAttributes(attrs, R.styleable.ExpandableView);
maxWidth = ar.getDimension(R.styleable.ExpandableView_maxVisibleWidth, 0); 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) { if(attrs != null) {
TypedArray ar = context.obtainStyledAttributes(attrs, R.styleable.ExpandableView); TypedArray ar = context.obtainStyledAttributes(attrs, R.styleable.ExpandableView);
maxWidth = ar.getDimension(R.styleable.ExpandableView_maxVisibleWidth, 0); maxWidth = ar.getDimension(R.styleable.ExpandableView_maxVisibleWidth, 0);
if (ar != null) {
ar.recycle();
}
} }
} }

3
OsmAnd/src/net/osmand/view/ExpandableLinearLayout.java
View file

@ -15,6 +15,9 @@ public class ExpandableLinearLayout extends LinearLayout {
if(attrs != null) { if(attrs != null) {
TypedArray ar = context.obtainStyledAttributes(attrs, R.styleable.ExpandableView); TypedArray ar = context.obtainStyledAttributes(attrs, R.styleable.ExpandableView);
maxWidth = ar.getDimension(R.styleable.ExpandableView_maxVisibleWidth, 0); maxWidth = ar.getDimension(R.styleable.ExpandableView_maxVisibleWidth, 0);
if (ar != null) {
ar.recycle();
}
} }
} }