summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Howard <showard@google.com>2010-09-27 16:33:54 -0700
committerSteve Howard <showard@google.com>2010-09-27 16:33:54 -0700
commit14961f94d762e733a733e3268fca1074d8da5f8c (patch)
tree59fb10a90c668f261243d9e85ac6afe1418fb6f5
parent57427e16d929b34a646dbcac0a16004f4a82cc9c (diff)
downloadandroid_packages_providers_DownloadProvider-14961f94d762e733a733e3268fca1074d8da5f8c.zip
android_packages_providers_DownloadProvider-14961f94d762e733a733e3268fca1074d8da5f8c.tar.gz
android_packages_providers_DownloadProvider-14961f94d762e733a733e3268fca1074d8da5f8c.tar.bz2
Moved DownloadManager to android.app (DO NOT MERGE)
I'll merge this manually, as there's some additional master-only code that will be to be simultaneously changed. Change-Id: Ifdb1740f32e228bc07f266585737b98a7b794685
-rw-r--r--src/com/android/providers/downloads/DownloadInfo.java2
-rw-r--r--src/com/android/providers/downloads/DownloadReceiver.java2
-rw-r--r--tests/public_api_access/src/com/android/providers/downloads/public_api_access_tests/PublicApiAccessTest.java2
-rw-r--r--tests/src/com/android/providers/downloads/AbstractPublicApiTest.java2
-rw-r--r--tests/src/com/android/providers/downloads/PublicApiFunctionalTest.java2
-rw-r--r--tests/src/com/android/providers/downloads/ThreadingTest.java2
-rw-r--r--ui/src/com/android/providers/downloads/ui/DateSortedDownloadAdapter.java2
-rw-r--r--ui/src/com/android/providers/downloads/ui/DateSortedExpandableListAdapter.java2
-rw-r--r--ui/src/com/android/providers/downloads/ui/DownloadAdapter.java2
-rw-r--r--ui/src/com/android/providers/downloads/ui/DownloadList.java2
10 files changed, 10 insertions, 10 deletions
diff --git a/src/com/android/providers/downloads/DownloadInfo.java b/src/com/android/providers/downloads/DownloadInfo.java
index 2196cfc..a204895 100644
--- a/src/com/android/providers/downloads/DownloadInfo.java
+++ b/src/com/android/providers/downloads/DownloadInfo.java
@@ -16,6 +16,7 @@
package com.android.providers.downloads;
+import android.app.DownloadManager;
import android.content.ContentResolver;
import android.content.ContentUris;
import android.content.ContentValues;
@@ -25,7 +26,6 @@ import android.database.CharArrayBuffer;
import android.database.Cursor;
import android.drm.mobile1.DrmRawContent;
import android.net.ConnectivityManager;
-import android.net.DownloadManager;
import android.net.Uri;
import android.provider.Downloads;
import android.provider.Downloads.Impl;
diff --git a/src/com/android/providers/downloads/DownloadReceiver.java b/src/com/android/providers/downloads/DownloadReceiver.java
index d81e026..c41895b 100644
--- a/src/com/android/providers/downloads/DownloadReceiver.java
+++ b/src/com/android/providers/downloads/DownloadReceiver.java
@@ -16,6 +16,7 @@
package com.android.providers.downloads;
+import android.app.DownloadManager;
import android.content.ActivityNotFoundException;
import android.content.BroadcastReceiver;
import android.content.ContentUris;
@@ -24,7 +25,6 @@ import android.content.Context;
import android.content.Intent;
import android.database.Cursor;
import android.net.ConnectivityManager;
-import android.net.DownloadManager;
import android.net.NetworkInfo;
import android.net.Uri;
import android.provider.Downloads;
diff --git a/tests/public_api_access/src/com/android/providers/downloads/public_api_access_tests/PublicApiAccessTest.java b/tests/public_api_access/src/com/android/providers/downloads/public_api_access_tests/PublicApiAccessTest.java
index 13bec33..2674e90 100644
--- a/tests/public_api_access/src/com/android/providers/downloads/public_api_access_tests/PublicApiAccessTest.java
+++ b/tests/public_api_access/src/com/android/providers/downloads/public_api_access_tests/PublicApiAccessTest.java
@@ -16,9 +16,9 @@
package com.android.providers.downloads.public_api_access_tests;
+import android.app.DownloadManager;
import android.content.ContentResolver;
import android.content.ContentValues;
-import android.net.DownloadManager;
import android.net.Uri;
import android.provider.Downloads;
import android.test.AndroidTestCase;
diff --git a/tests/src/com/android/providers/downloads/AbstractPublicApiTest.java b/tests/src/com/android/providers/downloads/AbstractPublicApiTest.java
index db6b246..ed443b0 100644
--- a/tests/src/com/android/providers/downloads/AbstractPublicApiTest.java
+++ b/tests/src/com/android/providers/downloads/AbstractPublicApiTest.java
@@ -16,8 +16,8 @@
package com.android.providers.downloads;
+import android.app.DownloadManager;
import android.database.Cursor;
-import android.net.DownloadManager;
import android.net.Uri;
import android.os.ParcelFileDescriptor;
diff --git a/tests/src/com/android/providers/downloads/PublicApiFunctionalTest.java b/tests/src/com/android/providers/downloads/PublicApiFunctionalTest.java
index 91cc3f3..ab7d0e4 100644
--- a/tests/src/com/android/providers/downloads/PublicApiFunctionalTest.java
+++ b/tests/src/com/android/providers/downloads/PublicApiFunctionalTest.java
@@ -16,10 +16,10 @@
package com.android.providers.downloads;
+import android.app.DownloadManager;
import android.content.Intent;
import android.database.Cursor;
import android.net.ConnectivityManager;
-import android.net.DownloadManager;
import android.net.Uri;
import android.os.Environment;
import android.provider.Downloads;
diff --git a/tests/src/com/android/providers/downloads/ThreadingTest.java b/tests/src/com/android/providers/downloads/ThreadingTest.java
index e8d86d6..082579e 100644
--- a/tests/src/com/android/providers/downloads/ThreadingTest.java
+++ b/tests/src/com/android/providers/downloads/ThreadingTest.java
@@ -16,7 +16,7 @@
package com.android.providers.downloads;
-import android.net.DownloadManager;
+import android.app.DownloadManager;
import android.test.suitebuilder.annotation.LargeTest;
/**
diff --git a/ui/src/com/android/providers/downloads/ui/DateSortedDownloadAdapter.java b/ui/src/com/android/providers/downloads/ui/DateSortedDownloadAdapter.java
index 3e23400..8c34782 100644
--- a/ui/src/com/android/providers/downloads/ui/DateSortedDownloadAdapter.java
+++ b/ui/src/com/android/providers/downloads/ui/DateSortedDownloadAdapter.java
@@ -19,9 +19,9 @@ package com.android.providers.downloads.ui;
import com.android.providers.downloads.ui.DownloadItem.DownloadSelectListener;
+import android.app.DownloadManager;
import android.content.Context;
import android.database.Cursor;
-import android.net.DownloadManager;
import android.view.View;
import android.view.ViewGroup;
import android.widget.RelativeLayout;
diff --git a/ui/src/com/android/providers/downloads/ui/DateSortedExpandableListAdapter.java b/ui/src/com/android/providers/downloads/ui/DateSortedExpandableListAdapter.java
index 58dd4bb..19132a1 100644
--- a/ui/src/com/android/providers/downloads/ui/DateSortedExpandableListAdapter.java
+++ b/ui/src/com/android/providers/downloads/ui/DateSortedExpandableListAdapter.java
@@ -16,11 +16,11 @@
package com.android.providers.downloads.ui;
+import android.app.DownloadManager;
import android.content.Context;
import android.database.ContentObserver;
import android.database.Cursor;
import android.database.DataSetObserver;
-import android.net.DownloadManager;
import android.os.Handler;
import android.view.LayoutInflater;
import android.view.View;
diff --git a/ui/src/com/android/providers/downloads/ui/DownloadAdapter.java b/ui/src/com/android/providers/downloads/ui/DownloadAdapter.java
index ffb181c..c7d4c2c 100644
--- a/ui/src/com/android/providers/downloads/ui/DownloadAdapter.java
+++ b/ui/src/com/android/providers/downloads/ui/DownloadAdapter.java
@@ -16,6 +16,7 @@
package com.android.providers.downloads.ui;
+import android.app.DownloadManager;
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
@@ -24,7 +25,6 @@ import android.content.res.Resources;
import android.database.Cursor;
import android.drm.mobile1.DrmRawContent;
import android.graphics.drawable.Drawable;
-import android.net.DownloadManager;
import android.net.Uri;
import android.text.format.Formatter;
import android.view.LayoutInflater;
diff --git a/ui/src/com/android/providers/downloads/ui/DownloadList.java b/ui/src/com/android/providers/downloads/ui/DownloadList.java
index cdfe017..4b3547c 100644
--- a/ui/src/com/android/providers/downloads/ui/DownloadList.java
+++ b/ui/src/com/android/providers/downloads/ui/DownloadList.java
@@ -18,6 +18,7 @@ package com.android.providers.downloads.ui;
import android.app.Activity;
import android.app.AlertDialog;
+import android.app.DownloadManager;
import android.content.ActivityNotFoundException;
import android.content.ContentUris;
import android.content.Context;
@@ -27,7 +28,6 @@ import android.content.Intent;
import android.database.ContentObserver;
import android.database.Cursor;
import android.database.DataSetObserver;
-import android.net.DownloadManager;
import android.net.Uri;
import android.os.Bundle;
import android.os.Environment;