Merge "Do not open archives inline in picker." (bd7e1747) · Commits · e / os / android_packages_apps_DocumentsUI

src/com/android/documentsui/picker/PickActivity.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -338,7 +338,9 @@ public class PickActivity extends BaseActivity implements ActionHandler.Addons {
		@Override
		public void onDocumentPicked(DocumentInfo doc) {
		final FragmentManager fm = getFragmentManager();
		if (doc.isContainer()) {
		// Do not inline-open archives, as otherwise it would be impossible to pick
		// archive files. Note, that picking files inside archives is not supported.
		if (doc.isDirectory()) {
		mInjector.actions.openContainerDocument(doc);
		} else if (mState.action == ACTION_OPEN \|\| mState.action == ACTION_GET_CONTENT) {
		// Explicit file picked, return