From a1448628237471a7a2aeb67b560b1502c2bd5ba8 Mon Sep 17 00:00:00 2001
From: Steve Howard <showard@google.com>
Date: Mon, 27 Sep 2010 16:33:54 -0700
Subject: Manual merge: Moved DownloadManager to android.app

Change-Id: Id1de44459ec1bf53e928cae826047467b355823d
---
 src/com/android/providers/downloads/DownloadInfo.java                   | 2 +-
 src/com/android/providers/downloads/DownloadReceiver.java               | 2 +-
 .../downloads/public_api_access_tests/PublicApiAccessTest.java          | 2 +-
 tests/src/com/android/providers/downloads/AbstractPublicApiTest.java    | 2 +-
 tests/src/com/android/providers/downloads/PublicApiFunctionalTest.java  | 2 +-
 tests/src/com/android/providers/downloads/ThreadingTest.java            | 2 +-
 .../com/android/providers/downloads/ui/DateSortedDownloadAdapter.java   | 2 +-
 .../android/providers/downloads/ui/DateSortedExpandableListAdapter.java | 2 +-
 ui/src/com/android/providers/downloads/ui/DownloadAdapter.java          | 2 +-
 ui/src/com/android/providers/downloads/ui/DownloadList.java             | 2 +-
 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 2196cfc6..a2048958 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 d81e0266..c41895b9 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 13bec33b..2674e907 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 db6b2468..ed443b01 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 91cc3f3b..ab7d0e4e 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 e8d86d66..082579e6 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 3e234008..8c347822 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 58dd4bb3..19132a11 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 ffb181ca..c7d4c2cb 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 cdfe0177..4b3547c2 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;
-- 
cgit v1.2.3