|
@@ -646,7 +646,7 @@ public class FileDisplayActivity extends FileActivity
|
|
public void showFileActions(OCFile file) {
|
|
public void showFileActions(OCFile file) {
|
|
dismissLoadingDialog();
|
|
dismissLoadingDialog();
|
|
OCFileListFragment listOfFiles = getOCFileListFragmentFromFile();
|
|
OCFileListFragment listOfFiles = getOCFileListFragmentFromFile();
|
|
- clearSearchViewIfSearchAndDrawerNotOpened(listOfFiles);
|
|
|
|
|
|
+ clearSearchViewIfSearchAndDrawerNotOpened(listOfFiles, false);
|
|
listOfFiles.onOverflowIconClicked(file, null);
|
|
listOfFiles.onOverflowIconClicked(file, null);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1049,9 +1049,9 @@ public class FileDisplayActivity extends FileActivity
|
|
setDrawerIndicatorEnabled(isDrawerIndicatorAvailable());
|
|
setDrawerIndicatorEnabled(isDrawerIndicatorAvailable());
|
|
}
|
|
}
|
|
|
|
|
|
- private void clearSearchViewIfSearchAndDrawerNotOpened(OCFileListFragment listOfFiles) {
|
|
|
|
|
|
+ private void clearSearchViewIfSearchAndDrawerNotOpened(OCFileListFragment listOfFiles, Boolean moveTaskBack) {
|
|
OCFile currentDir = getCurrentDir();
|
|
OCFile currentDir = getCurrentDir();
|
|
- if (currentDir == null || currentDir.getParentId() == FileDataStorageManager.ROOT_PARENT_ID) {
|
|
|
|
|
|
+ if (currentDir == null || currentDir.getParentId() == FileDataStorageManager.ROOT_PARENT_ID && moveTaskBack) {
|
|
finish();
|
|
finish();
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
@@ -1086,7 +1086,7 @@ public class FileDisplayActivity extends FileActivity
|
|
// close drawer first
|
|
// close drawer first
|
|
super.onBackPressed();
|
|
super.onBackPressed();
|
|
} else {
|
|
} else {
|
|
- clearSearchViewIfSearchAndDrawerNotOpened(listOfFiles);
|
|
|
|
|
|
+ clearSearchViewIfSearchAndDrawerNotOpened(listOfFiles, true);
|
|
}
|
|
}
|
|
} else if (leftFragment instanceof PreviewTextStringFragment) {
|
|
} else if (leftFragment instanceof PreviewTextStringFragment) {
|
|
createMinFragments(null);
|
|
createMinFragments(null);
|