Merge remote-tracking branch 'origin/master'

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

View file

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

View file

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