diff options
Diffstat (limited to 'packages')
8 files changed, 73 insertions, 25 deletions
diff --git a/packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java b/packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java index b2981db..aee865b 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java +++ b/packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java @@ -125,9 +125,8 @@ public class DirectoryFragment extends Fragment { show(fm, TYPE_NORMAL, root, doc, null); } - public static void showSearch( - FragmentManager fm, RootInfo root, DocumentInfo doc, String query) { - show(fm, TYPE_SEARCH, root, doc, query); + public static void showSearch(FragmentManager fm, RootInfo root, String query) { + show(fm, TYPE_SEARCH, root, null, query); } public static void showRecentsOpen(FragmentManager fm) { @@ -205,7 +204,7 @@ public class DirectoryFragment extends Fragment { context, mType, root, doc, contentsUri, state.userSortOrder); case TYPE_SEARCH: contentsUri = DocumentsContract.buildSearchDocumentsUri( - doc.authority, doc.documentId, query); + root.authority, root.rootId, query); if (state.action == ACTION_MANAGE) { contentsUri = DocumentsContract.setManageMode(contentsUri); } @@ -274,7 +273,7 @@ public class DirectoryFragment extends Fragment { final RootInfo root = getArguments().getParcelable(EXTRA_ROOT); final DocumentInfo doc = getArguments().getParcelable(EXTRA_DOC); - if (root != null) { + if (root != null && doc != null) { final Uri stateUri = RecentsProvider.buildState( root.authority, root.rootId, doc.documentId); final ContentValues values = new ContentValues(); diff --git a/packages/DocumentsUI/src/com/android/documentsui/DirectoryLoader.java b/packages/DocumentsUI/src/com/android/documentsui/DirectoryLoader.java index 334e262..8627ecf 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/DirectoryLoader.java +++ b/packages/DocumentsUI/src/com/android/documentsui/DirectoryLoader.java @@ -32,6 +32,7 @@ import android.database.Cursor; import android.net.Uri; import android.os.CancellationSignal; import android.os.OperationCanceledException; +import android.provider.DocumentsContract; import android.provider.DocumentsContract.Document; import android.util.Log; @@ -42,6 +43,8 @@ import com.android.documentsui.model.RootInfo; import libcore.io.IoUtils; +import java.io.FileNotFoundException; + class DirectoryResult implements AutoCloseable { ContentProviderClient client; Cursor cursor; @@ -64,7 +67,7 @@ public class DirectoryLoader extends AsyncTaskLoader<DirectoryResult> { private final int mType; private final RootInfo mRoot; - private final DocumentInfo mDoc; + private DocumentInfo mDoc; private final Uri mUri; private final int mUserSortOrder; @@ -97,6 +100,19 @@ public class DirectoryLoader extends AsyncTaskLoader<DirectoryResult> { int userMode = State.MODE_UNKNOWN; + // Use default document when searching + if (mType == DirectoryFragment.TYPE_SEARCH) { + final Uri docUri = DocumentsContract.buildDocumentUri( + mRoot.authority, mRoot.documentId); + try { + mDoc = DocumentInfo.fromUri(resolver, docUri); + } catch (FileNotFoundException e) { + Log.w(TAG, "Failed to query", e); + result.exception = e; + return result; + } + } + // Pick up any custom modes requested by user Cursor cursor = null; try { @@ -157,7 +173,7 @@ public class DirectoryLoader extends AsyncTaskLoader<DirectoryResult> { result.cursor = cursor; } catch (Exception e) { - Log.d(TAG, "Failed to query", e); + Log.w(TAG, "Failed to query", e); result.exception = e; ContentProviderClient.closeQuietly(result.client); } finally { diff --git a/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java b/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java index eb51fb5..b1e51a0 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java +++ b/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java @@ -45,6 +45,7 @@ import android.net.Uri; import android.os.Bundle; import android.os.Parcel; import android.provider.DocumentsContract; +import android.provider.DocumentsContract.Root; import android.support.v4.app.ActionBarDrawerToggle; import android.support.v4.view.GravityCompat; import android.support.v4.widget.DrawerLayout; @@ -442,6 +443,8 @@ public class DocumentsActivity extends Activity { super.onPrepareOptionsMenu(menu); final FragmentManager fm = getFragmentManager(); + + final RootInfo root = getCurrentRoot(); final DocumentInfo cwd = getCurrentDirectory(); final MenuItem createDir = menu.findItem(R.id.menu_create_dir); @@ -503,7 +506,9 @@ public class DocumentsActivity extends Activity { SaveFragment.get(fm).setSaveEnabled(cwd != null && cwd.isCreateSupported()); } else { createDir.setVisible(false); - searchVisible = cwd != null && cwd.isSearchSupported(); + + searchVisible = root != null + && ((root.flags & Root.FLAG_SUPPORTS_SEARCH) != 0); } // TODO: close any search in-progress when hiding @@ -722,7 +727,7 @@ public class DocumentsActivity extends Activity { } else { if (mState.currentSearch != null) { // Ongoing search - DirectoryFragment.showSearch(fm, root, cwd, mState.currentSearch); + DirectoryFragment.showSearch(fm, root, mState.currentSearch); } else { // Normal boring directory DirectoryFragment.showNormal(fm, root, cwd); diff --git a/packages/DocumentsUI/src/com/android/documentsui/RootsCache.java b/packages/DocumentsUI/src/com/android/documentsui/RootsCache.java index b48674cf..4d313e8 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/RootsCache.java +++ b/packages/DocumentsUI/src/com/android/documentsui/RootsCache.java @@ -176,6 +176,7 @@ public class RootsCache { final boolean supportsCreate = (root.flags & Root.FLAG_SUPPORTS_CREATE) != 0; final boolean advanced = (root.flags & Root.FLAG_ADVANCED) != 0; final boolean localOnly = (root.flags & Root.FLAG_LOCAL_ONLY) != 0; + final boolean empty = (root.flags & Root.FLAG_EMPTY) != 0; // Exclude read-only devices when creating if (state.action == State.ACTION_CREATE && !supportsCreate) continue; @@ -183,6 +184,8 @@ public class RootsCache { if (!state.showAdvanced && advanced) continue; // Exclude non-local devices when local only if (state.localOnly && !localOnly) continue; + // Only show empty roots when creating + if (state.action != State.ACTION_CREATE && empty) continue; // Only include roots that serve requested content final boolean overlap = diff --git a/packages/DocumentsUI/src/com/android/documentsui/model/DocumentInfo.java b/packages/DocumentsUI/src/com/android/documentsui/model/DocumentInfo.java index c69103e..ab55d94 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/model/DocumentInfo.java +++ b/packages/DocumentsUI/src/com/android/documentsui/model/DocumentInfo.java @@ -188,10 +188,6 @@ public class DocumentInfo implements Durable, Parcelable { return (flags & Document.FLAG_DIR_SUPPORTS_CREATE) != 0; } - public boolean isSearchSupported() { - return (flags & Document.FLAG_DIR_SUPPORTS_SEARCH) != 0; - } - public boolean isThumbnailSupported() { return (flags & Document.FLAG_SUPPORTS_THUMBNAIL) != 0; } diff --git a/packages/DocumentsUI/src/com/android/documentsui/model/RootInfo.java b/packages/DocumentsUI/src/com/android/documentsui/model/RootInfo.java index b5a198c..1afc80a 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/model/RootInfo.java +++ b/packages/DocumentsUI/src/com/android/documentsui/model/RootInfo.java @@ -161,15 +161,21 @@ public class RootInfo implements Durable, Parcelable { // TODO: remove these special case icons if ("com.android.externalstorage.documents".equals(authority)) { - derivedIcon = R.drawable.ic_root_sdcard; + if ("documents".equals(rootId)) { + derivedIcon = R.drawable.ic_doc_text; + } else { + derivedIcon = R.drawable.ic_root_sdcard; + } } if ("com.android.providers.downloads.documents".equals(authority)) { derivedIcon = R.drawable.ic_root_download; } if ("com.android.providers.media.documents".equals(authority)) { - if ("image".equals(rootId)) { + if ("images_root".equals(rootId)) { derivedIcon = R.drawable.ic_doc_image; - } else if ("audio".equals(rootId)) { + } else if ("videos_root".equals(rootId)) { + derivedIcon = R.drawable.ic_doc_video; + } else if ("audio_root".equals(rootId)) { derivedIcon = R.drawable.ic_doc_audio; } } diff --git a/packages/ExternalStorageProvider/res/values/strings.xml b/packages/ExternalStorageProvider/res/values/strings.xml index 0eaf500a..f1c1ade 100644 --- a/packages/ExternalStorageProvider/res/values/strings.xml +++ b/packages/ExternalStorageProvider/res/values/strings.xml @@ -15,6 +15,11 @@ --> <resources> + <!-- Title of the external storage application [CHAR LIMIT=32] --> <string name="app_label">External Storage</string> + + <!-- Title for documents backend that offers internal storage. [CHAR LIMIT=24] --> <string name="root_internal_storage">Internal storage</string> + <!-- Title for documents backend that offers documents. [CHAR LIMIT=24] --> + <string name="root_documents">Documents</string> </resources> diff --git a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java index ada3ad7..3e2cd15 100644 --- a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java +++ b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java @@ -62,7 +62,6 @@ public class ExternalStorageProvider extends DocumentsProvider { public String rootId; public int rootType; public int flags; - public int icon; public String title; public String docId; } @@ -85,9 +84,10 @@ public class ExternalStorageProvider extends DocumentsProvider { mIdToPath.put(rootId, path); final RootInfo root = new RootInfo(); - root.rootId = "primary"; + root.rootId = rootId; root.rootType = Root.ROOT_TYPE_DEVICE; - root.flags = Root.FLAG_SUPPORTS_CREATE | Root.FLAG_LOCAL_ONLY | Root.FLAG_ADVANCED; + root.flags = Root.FLAG_SUPPORTS_CREATE | Root.FLAG_LOCAL_ONLY | Root.FLAG_ADVANCED + | Root.FLAG_SUPPORTS_SEARCH; root.title = getContext().getString(R.string.root_internal_storage); root.docId = getDocIdForFile(path); mRoots.add(root); @@ -96,6 +96,25 @@ public class ExternalStorageProvider extends DocumentsProvider { throw new IllegalStateException(e); } + try { + final String rootId = "documents"; + final File path = Environment.getExternalStoragePublicDirectory( + Environment.DIRECTORY_DOCUMENTS); + mIdToPath.put(rootId, path); + + final RootInfo root = new RootInfo(); + root.rootId = rootId; + root.rootType = Root.ROOT_TYPE_SHORTCUT; + root.flags = Root.FLAG_SUPPORTS_CREATE | Root.FLAG_LOCAL_ONLY + | Root.FLAG_SUPPORTS_SEARCH; + root.title = getContext().getString(R.string.root_documents); + root.docId = getDocIdForFile(path); + mRoots.add(root); + mIdToRoot.put(rootId, root); + } catch (FileNotFoundException e) { + throw new IllegalStateException(e); + } + return true; } @@ -146,6 +165,9 @@ public class ExternalStorageProvider extends DocumentsProvider { if (target == null) { throw new FileNotFoundException("No root for " + tag); } + if (!target.exists()) { + target.mkdirs(); + } target = new File(target, path); if (!target.exists()) { throw new FileNotFoundException("Missing file for " + docId + " at " + target); @@ -163,9 +185,6 @@ public class ExternalStorageProvider extends DocumentsProvider { int flags = 0; - if (file.isDirectory()) { - flags |= Document.FLAG_DIR_SUPPORTS_SEARCH; - } if (file.isDirectory() && file.canWrite()) { flags |= Document.FLAG_DIR_SUPPORTS_CREATE; } @@ -200,7 +219,6 @@ public class ExternalStorageProvider extends DocumentsProvider { row.add(Root.COLUMN_ROOT_ID, root.rootId); row.add(Root.COLUMN_ROOT_TYPE, root.rootType); row.add(Root.COLUMN_FLAGS, root.flags); - row.add(Root.COLUMN_ICON, root.icon); row.add(Root.COLUMN_TITLE, root.title); row.add(Root.COLUMN_DOCUMENT_ID, root.docId); row.add(Root.COLUMN_AVAILABLE_BYTES, path.getFreeSpace()); @@ -260,10 +278,10 @@ public class ExternalStorageProvider extends DocumentsProvider { } @Override - public Cursor querySearchDocuments(String parentDocumentId, String query, String[] projection) + public Cursor querySearchDocuments(String rootId, String query, String[] projection) throws FileNotFoundException { final MatrixCursor result = new MatrixCursor(resolveDocumentProjection(projection)); - final File parent = getFileForDocId(parentDocumentId); + final File parent = mIdToPath.get(rootId); final LinkedList<File> pending = new LinkedList<File>(); pending.add(parent); |