From 14961f94d762e733a733e3268fca1074d8da5f8c Mon Sep 17 00:00:00 2001
From: Steve Howard <showard@google.com>
Date: Mon, 27 Sep 2010 16:33:54 -0700
Subject: 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
---
 .../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 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'ui')

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