yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-06 12:00:17 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' into ice-cream-sandwich

Browse source 
Conflicts:
	src/org/geometerplus/android/fbreader/library/LibraryActivity.java
This commit is contained in:
Nikolay Pultsin 2014-08-11 15:55:06 +01:00
commit 70f1ca33dc
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/org/geometerplus/android/fbreader/library/LibraryActivity.java
View file

@ -328,7 +328,9 @@ public class LibraryActivity extends TreeActivity<LibraryTree> implements MenuIt
final String label = LibraryTree.resource().getResource(resourceKey).getValue();
final MenuItem item = menu.add(0, id, Menu.NONE, label);
item.setOnMenuItemClickListener(this);
//item.setIcon(iconId);
if (iconId != -1) {
//item.setIcon(iconId);
}
item.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
return item;
}