Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
44331a6b9b
2 changed files with 6 additions and 2 deletions
|
@ -55,8 +55,12 @@ public class ContextMenuAdapter {
|
|||
}
|
||||
|
||||
public void addItem(ContextMenuItem item) {
|
||||
try {
|
||||
items.add(item.getPos(), item);
|
||||
} catch (IndexOutOfBoundsException ex) {
|
||||
items.add(item);
|
||||
}
|
||||
}
|
||||
|
||||
public ContextMenuItem getItem(int position) {
|
||||
return items.get(position);
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue