notaz.gp2x.de
/
android_pandora.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merge in OI distribution
[android_pandora.git]
/
apps
/
oi-filemanager
/
FileManager
/
src
/
org
/
openintents
/
filemanager
/
FileManagerActivity.java
diff --git
a/apps/oi-filemanager/FileManager/src/org/openintents/filemanager/FileManagerActivity.java
b/apps/oi-filemanager/FileManager/src/org/openintents/filemanager/FileManagerActivity.java
index
348f2c3
..
1ba53de
100644
(file)
--- a/
apps/oi-filemanager/FileManager/src/org/openintents/filemanager/FileManagerActivity.java
+++ b/
apps/oi-filemanager/FileManager/src/org/openintents/filemanager/FileManagerActivity.java
@@
-28,7
+28,7
@@
import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
import java.util.LinkedList;
import java.util.List;
-import org.openintents.
distribution
.DistributionLibraryListActivity;
+import org.openintents.
filemanager
.DistributionLibraryListActivity;
import org.openintents.filemanager.util.CompressManager;
import org.openintents.filemanager.util.ExtractManager;
import org.openintents.filemanager.util.FileUtils;
import org.openintents.filemanager.util.CompressManager;
import org.openintents.filemanager.util.ExtractManager;
import org.openintents.filemanager.util.FileUtils;
@@
-1167,7
+1167,7
@@
public class FileManagerActivity extends DistributionLibraryListActivity impleme
}
MenuItem item = menu.add(0, MENU_NEW_FOLDER, 0, R.string.menu_new_folder).setIcon(
icon).setShortcut('0', 'f');
}
MenuItem item = menu.add(0, MENU_NEW_FOLDER, 0, R.string.menu_new_folder).setIcon(
icon).setShortcut('0', 'f');
- MenuCompat.setShowAsAction(item,
MenuItem.SHOW_AS_ACTION_IF_ROOM
);
+ MenuCompat.setShowAsAction(item,
0/*MenuItem.SHOW_AS_ACTION_IF_ROOM*/
);
if (mState == STATE_BROWSE) {
// Multi select option menu.
if (mState == STATE_BROWSE) {
// Multi select option menu.