Merge "Fix index computation for quick viewing." into nyc-dev

1 files changed, 8 insertions, 5 deletions

diff --git a/packages/DocumentsUI/src/com/android/documentsui/QuickViewIntentBuilder.java b/packages/DocumentsUI/src/com/android/documentsui/QuickViewIntentBuilder.java
index c78face9730a..af6aee759eec 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/QuickViewIntentBuilder.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/QuickViewIntentBuilder.java
@@ -101,7 +101,10 @@ final class QuickViewIntentBuilder {
                     }
                 }
 
-                intent.putExtra(Intent.EXTRA_INDEX, documentLocation);
+                // The documentLocation variable contains an index in "uris". However,
+                // ClipData contains a slice of "uris", so we need to shift the location
+                // so it points to the same Uri.
+                intent.putExtra(Intent.EXTRA_INDEX, documentLocation - range.getLower());
                 intent.setClipData(clipData);
 
                 return intent;
@@ -147,12 +150,12 @@ final class QuickViewIntentBuilder {
             authority = getCursorString(cursor, RootCursorWrapper.COLUMN_AUTHORITY);
             uri = DocumentsContract.buildDocumentUri(authority, id);
 
+            uris.add(uri);
+
             if (id.equals(mDocument.documentId)) {
-                if (DEBUG) Log.d(TAG, "Found starting point for QV. " + i);
-                documentLocation = i;
+                documentLocation = uris.size() - 1;  // Position in "uris", not in the model.
+                if (DEBUG) Log.d(TAG, "Found starting point for QV. " + documentLocation);
             }
-
-            uris.add(uri);
         }
 
         return documentLocation;