Merge "Let focused item also act as a starting anchor for range selection." into nyc-andromeda-dev
diff --git a/src/com/android/documentsui/DirectoryLoader.java b/src/com/android/documentsui/DirectoryLoader.java
index 8af1ab3..9cdc160 100644
--- a/src/com/android/documentsui/DirectoryLoader.java
+++ b/src/com/android/documentsui/DirectoryLoader.java
@@ -103,7 +103,7 @@
cursor = new RootCursorWrapper(mUri.getAuthority(), mRoot.rootId, cursor, -1);
if (mSearchMode && !Shared.ENABLE_OMC_API_FEATURES) {
- // There is no findPath API. Enable filtering on folders in search mode.
+ // There is no findDocumentPath API. Enable filtering on folders in search mode.
cursor = new FilteringCursorWrapper(cursor, null, SEARCH_REJECT_MIMES);
}
diff --git a/src/com/android/documentsui/DocumentsAccess.java b/src/com/android/documentsui/DocumentsAccess.java
index 80d4589..63f235c 100644
--- a/src/com/android/documentsui/DocumentsAccess.java
+++ b/src/com/android/documentsui/DocumentsAccess.java
@@ -46,7 +46,7 @@
@Nullable DocumentInfo getArchiveDocument(Uri uri);
boolean isDocumentUri(Uri uri);
- @Nullable Path findPath(Uri uri) throws RemoteException;
+ @Nullable Path findDocumentPath(Uri uri) throws RemoteException;
List<DocumentInfo> getDocuments(String authority, List<String> docIds) throws RemoteException;
@@ -116,11 +116,11 @@
}
@Override
- public Path findPath(Uri docUri) throws RemoteException {
+ public Path findDocumentPath(Uri docUri) throws RemoteException {
final ContentResolver resolver = mContext.getContentResolver();
try (final ContentProviderClient client = DocumentsApplication
.acquireUnstableProviderOrThrow(resolver, docUri.getAuthority())) {
- return DocumentsContract.findPath(client, docUri);
+ return DocumentsContract.findDocumentPath(client, docUri);
}
}
}
diff --git a/src/com/android/documentsui/LoadDocStackTask.java b/src/com/android/documentsui/LoadDocStackTask.java
index a73945c..626b4ff 100644
--- a/src/com/android/documentsui/LoadDocStackTask.java
+++ b/src/com/android/documentsui/LoadDocStackTask.java
@@ -63,11 +63,11 @@
final Uri docUri = uris[0];
if (Shared.ENABLE_OMC_API_FEATURES && mDocs.isDocumentUri(docUri)) {
try {
- final Path path = mDocs.findPath(docUri);
+ final Path path = mDocs.findDocumentPath(docUri);
if (path != null) {
return buildStack(docUri.getAuthority(), path);
} else {
- Log.i(TAG, "Remote provider doesn't support findPath.");
+ Log.i(TAG, "Remote provider doesn't support findDocumentPath.");
}
} catch (Exception e) {
Log.e(TAG, "Failed to build document stack for uri: " + docUri, e);
diff --git a/tests/common/com/android/documentsui/testing/TestDocumentsAccess.java b/tests/common/com/android/documentsui/testing/TestDocumentsAccess.java
index fb821ee..cb8da30 100644
--- a/tests/common/com/android/documentsui/testing/TestDocumentsAccess.java
+++ b/tests/common/com/android/documentsui/testing/TestDocumentsAccess.java
@@ -62,7 +62,7 @@
}
@Override
- public Path findPath(Uri docUri) throws RemoteException {
+ public Path findDocumentPath(Uri docUri) throws RemoteException {
return nextPath;
}
}