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 2016-05-01 20:41:19 +02:00
commit 44331a6b9b
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OsmAnd/src/net/osmand/plus/ContextMenuAdapter.java
View file

@ -55,8 +55,12 @@ public class ContextMenuAdapter {
} }
public void addItem(ContextMenuItem item) { public void addItem(ContextMenuItem item) {
try {
items.add(item.getPos(), item);
} catch (IndexOutOfBoundsException ex) {
items.add(item); items.add(item);
} }
}
public ContextMenuItem getItem(int position) { public ContextMenuItem getItem(int position) {
return items.get(position); return items.get(position);

2
OsmAnd/src/net/osmand/plus/ContextMenuItem.java
View file

@ -198,7 +198,7 @@ public class ContextMenuItem {
private int mLayout = INVALID_ID; private int mLayout = INVALID_ID;
private boolean mLoading = false; private boolean mLoading = false;
private boolean mIsCategory = false; private boolean mIsCategory = false;
private int mPosition = INVALID_ID; private int mPosition = -1;
private String mDescription = null; private String mDescription = null;
private ContextMenuAdapter.ItemClickListener mItemClickListener = null; private ContextMenuAdapter.ItemClickListener mItemClickListener = null;
private ContextMenuAdapter.OnIntegerValueChangedListener mIntegerListener = null; private ContextMenuAdapter.OnIntegerValueChangedListener mIntegerListener = null;