2 files changed, 7 insertions, 15 deletions
diff --git a/ui/src/com/android/providers/downloads/ui/DownloadItem.java b/ui/src/com/android/providers/downloads/ui/DownloadItem.java
index 25f58638..e24ac4a4 100644
--- a/ui/src/com/android/providers/downloads/ui/DownloadItem.java
+++ b/ui/src/com/android/providers/downloads/ui/DownloadItem.java
@@ -18,6 +18,7 @@ package com.android.providers.downloads.ui;
 
 import android.content.Context;
 import android.util.AttributeSet;
+import android.view.accessibility.AccessibilityEvent;
 import android.view.MotionEvent;
 import android.widget.CheckBox;
 import android.widget.Checkable;
@@ -100,6 +101,7 @@ public class DownloadItem extends GridLayout implements Checkable {
             case MotionEvent.ACTION_UP:
                 if (mIsInDownEvent && event.getX() < CHECKMARK_AREA) {
                     toggle();
+                    sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_CLICKED);
                     handled = true;
                 }
                 mIsInDownEvent = false;
diff --git a/ui/src/com/android/providers/downloads/ui/DownloadList.java b/ui/src/com/android/providers/downloads/ui/DownloadList.java
index 103d3f83..6ffa0691 100644
--- a/ui/src/com/android/providers/downloads/ui/DownloadList.java
+++ b/ui/src/com/android/providers/downloads/ui/DownloadList.java
@@ -32,6 +32,7 @@ import android.os.Bundle;
 import android.os.Environment;
 import android.os.Handler;
 import android.os.Parcelable;
+import android.provider.BaseColumns;
 import android.provider.Downloads;
 import android.util.Log;
 import android.util.SparseBooleanArray;
@@ -50,6 +51,8 @@ import android.widget.ExpandableListView.OnChildClickListener;
 import android.widget.ListView;
 import android.widget.Toast;
 
+import com.android.providers.downloads.OpenHelper;
+
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -499,7 +502,6 @@ public class DownloadList extends Activity {
      * Send an Intent to open the download currently pointed to by the given cursor.
      */
     private void openCurrentDownload(Cursor cursor) {
-        final long id = cursor.getInt(mIdColumnId);
         final Uri localUri = Uri.parse(cursor.getString(mLocalUriColumnId));
         try {
             getContentResolver().openFileDescriptor(localUri, "r").close();
@@ -512,20 +514,8 @@ public class DownloadList extends Activity {
             // close() failed, not a problem
         }
 
-        final Uri viewUri;
-        final String mimeType = cursor.getString(mMediaTypeColumnId);
-        if ("application/vnd.android.package-archive".equals(mimeType)) {
-            // PackageInstaller doesn't like content URIs, so open file
-            viewUri = localUri;
-        } else if ("file".equals(localUri.getScheme())) {
-            viewUri = ContentUris.withAppendedId(Downloads.Impl.ALL_DOWNLOADS_CONTENT_URI, id);
-        } else {
-            viewUri = localUri;
-        }
-
-        Intent intent = new Intent(Intent.ACTION_VIEW);
-        intent.setDataAndType(viewUri, mimeType);
-        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_GRANT_READ_URI_PERMISSION);
+        final long id = cursor.getLong(cursor.getColumnIndexOrThrow(BaseColumns._ID));
+        final Intent intent = OpenHelper.buildViewIntent(this, id);
         try {
             startActivity(intent);
         } catch (ActivityNotFoundException ex) {