forked from upstream-mirrors/OpenTracks
fix merge conflict
This commit is contained in:
@@ -167,7 +167,7 @@ public class MarkerListActivity extends FragmentActivity {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
listView.setAdapter(resourceCursorAdapter);
|
listView.setAdapter(resourceCursorAdapter);
|
||||||
ApiAdapterFactory.getApiAdapter().configureContextualMenu(
|
ApiAdapterFactory.getApiAdapter().configureListViewContextualMenu(
|
||||||
this, listView, R.menu.marker_list_context_menu, R.id.marker_list_item_name,
|
this, listView, R.menu.marker_list_context_menu, R.id.marker_list_item_name,
|
||||||
contextualActionModeCallback);
|
contextualActionModeCallback);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user