diff options
author | Jeff Sharkey <jsharkey@android.com> | 2013-10-24 12:40:07 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-24 12:40:07 -0700 |
commit | 8e0164c5660ff821ad839014f87de4f90a6d8936 (patch) | |
tree | 3330aded637166c602463c8f62dc0b830800e84e /packages/ExternalStorageProvider | |
parent | 641089b69bfa878ae9527df8c4705355eaf2ac7c (diff) | |
parent | 46106ca28e8a679ce2f0609d03ae6ba4b95d7f30 (diff) | |
download | frameworks_base-8e0164c5660ff821ad839014f87de4f90a6d8936.zip frameworks_base-8e0164c5660ff821ad839014f87de4f90a6d8936.tar.gz frameworks_base-8e0164c5660ff821ad839014f87de4f90a6d8936.tar.bz2 |
am 46106ca2: am 686fa2db: am c832ef0d: Merge "Show spinner while waiting for mutations." into klp-dev
* commit '46106ca28e8a679ce2f0609d03ae6ba4b95d7f30':
Show spinner while waiting for mutations.
Diffstat (limited to 'packages/ExternalStorageProvider')
-rw-r--r-- | packages/ExternalStorageProvider/src/com/android/externalstorage/TestDocumentsProvider.java | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/packages/ExternalStorageProvider/src/com/android/externalstorage/TestDocumentsProvider.java b/packages/ExternalStorageProvider/src/com/android/externalstorage/TestDocumentsProvider.java index 71ce4dd..af6ff01 100644 --- a/packages/ExternalStorageProvider/src/com/android/externalstorage/TestDocumentsProvider.java +++ b/packages/ExternalStorageProvider/src/com/android/externalstorage/TestDocumentsProvider.java @@ -127,7 +127,7 @@ public class TestDocumentsProvider extends DocumentsProvider { final MatrixCursor result = new MatrixCursor(resolveRootProjection(projection)); final RowBuilder row = result.newRow(); row.add(Root.COLUMN_ROOT_ID, MY_ROOT_ID); - row.add(Root.COLUMN_FLAGS, Root.FLAG_SUPPORTS_RECENTS); + row.add(Root.COLUMN_FLAGS, Root.FLAG_SUPPORTS_RECENTS | Root.FLAG_SUPPORTS_CREATE); row.add(Root.COLUMN_TITLE, "_Test title which is really long"); row.add(Root.COLUMN_SUMMARY, SystemClock.elapsedRealtime() + " summary which is also super long text"); @@ -147,6 +147,14 @@ public class TestDocumentsProvider extends DocumentsProvider { return result; } + @Override + public String createDocument(String parentDocumentId, String mimeType, String displayName) + throws FileNotFoundException { + if (LAG) lagUntilCanceled(null); + + return super.createDocument(parentDocumentId, mimeType, displayName); + } + /** * Holds any outstanding or finished "network" fetching. */ @@ -386,6 +394,7 @@ public class TestDocumentsProvider extends DocumentsProvider { if (MY_DOC_ID.equals(docId)) { row.add(Document.COLUMN_MIME_TYPE, Document.MIME_TYPE_DIR); + row.add(Document.COLUMN_FLAGS, Document.FLAG_DIR_SUPPORTS_CREATE); } else if (MY_DOC_NULL.equals(docId)) { // No MIME type } else { |