diff options
| author | Steve Howard <showard@google.com> | 2010-09-27 16:33:54 -0700 |
|---|---|---|
| committer | Steve Howard <showard@google.com> | 2010-09-28 17:21:46 -0700 |
| commit | a1448628237471a7a2aeb67b560b1502c2bd5ba8 (patch) | |
| tree | f045c919911121d0b0495dfcb418d9957b52bdcf /ui/src/com/android/providers/downloads | |
| parent | bdd53b09f47e43bc3c307fc3a0be940f6f920c6a (diff) | |
| download | android_packages_providers_DownloadProvider-a1448628237471a7a2aeb67b560b1502c2bd5ba8.tar.gz android_packages_providers_DownloadProvider-a1448628237471a7a2aeb67b560b1502c2bd5ba8.tar.bz2 android_packages_providers_DownloadProvider-a1448628237471a7a2aeb67b560b1502c2bd5ba8.zip | |
Manual merge: Moved DownloadManager to android.app
Change-Id: Id1de44459ec1bf53e928cae826047467b355823d
Diffstat (limited to 'ui/src/com/android/providers/downloads')
4 files changed, 4 insertions, 4 deletions
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; |