summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--res/values-kk/strings.xml2
-rw-r--r--res/values-nl/strings.xml2
-rw-r--r--res/values-vi/strings.xml2
-rw-r--r--src/com/android/providers/downloads/DownloadStorageProvider.java12
-rw-r--r--ui/res/values-da/strings.xml2
-rw-r--r--ui/res/values-hi/strings.xml6
-rw-r--r--ui/res/values-kk/strings.xml2
-rw-r--r--ui/res/values-uz/strings.xml2
8 files changed, 18 insertions, 12 deletions
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index e7d0731c..1ed6618a 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -52,7 +52,7 @@
</plurals>
<string name="download_remaining" msgid="3139295890887972718">"<xliff:g id="DURATION">%s</xliff:g> қалды"</string>
<string name="download_no_application_title" msgid="7935659741162801699">"Файлды аша алмады"</string>
- <string name="root_downloads" msgid="4098414876292351487">"Жүктеулер"</string>
+ <string name="root_downloads" msgid="4098414876292351487">"Жүктеп алынған"</string>
<string name="download_queued" msgid="3302638231377947451">"Кезекте"</string>
<string name="download_running" msgid="3925050393361158266">"Жүктелуде"</string>
<string name="download_error" msgid="5144180777324573236">"Сәтсіз"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 02b25cdf..3ab26c85 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -50,7 +50,7 @@
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> bestanden in de wachtrij</item>
<item quantity="one">1 bestand in de wachtrij</item>
</plurals>
- <string name="download_remaining" msgid="3139295890887972718">"<xliff:g id="DURATION">%s</xliff:g> resterend"</string>
+ <string name="download_remaining" msgid="3139295890887972718">"Nog <xliff:g id="DURATION">%s</xliff:g>"</string>
<string name="download_no_application_title" msgid="7935659741162801699">"Kan bestand niet openen"</string>
<string name="root_downloads" msgid="4098414876292351487">"Downloads"</string>
<string name="download_queued" msgid="3302638231377947451">"In wachtrij"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 670ae968..4b49a15f 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -52,7 +52,7 @@
</plurals>
<string name="download_remaining" msgid="3139295890887972718">"Còn lại <xliff:g id="DURATION">%s</xliff:g>"</string>
<string name="download_no_application_title" msgid="7935659741162801699">"Không thể mở tệp"</string>
- <string name="root_downloads" msgid="4098414876292351487">"Bản tải xuống"</string>
+ <string name="root_downloads" msgid="4098414876292351487">"Tệp tải xuống"</string>
<string name="download_queued" msgid="3302638231377947451">"Đã xếp hàng"</string>
<string name="download_running" msgid="3925050393361158266">"Đang thực hiện"</string>
<string name="download_error" msgid="5144180777324573236">"Không thành công"</string>
diff --git a/src/com/android/providers/downloads/DownloadStorageProvider.java b/src/com/android/providers/downloads/DownloadStorageProvider.java
index 6683b308..042679fa 100644
--- a/src/com/android/providers/downloads/DownloadStorageProvider.java
+++ b/src/com/android/providers/downloads/DownloadStorageProvider.java
@@ -419,9 +419,15 @@ public class DownloadStorageProvider extends FileSystemProvider {
mediaStoreIds, null /* queryArgs */);
}
notificationUris.add(cursor.getNotificationUri());
- includeDownloadsFromMediaStore(result, null /* queryArgs */, mediaStoreIds,
- null /* filePaths */, notificationUris, null /* parentId */,
- (limit - result.getCount()), false /* includePending */);
+
+ // Skip media files that have been inserted into the MediaStore so we
+ // don't duplicate them in the recent list.
+ final Bundle args = new Bundle();
+ args.putBoolean(DocumentsContract.QUERY_ARG_EXCLUDE_MEDIA, true);
+
+ includeDownloadsFromMediaStore(result, args, mediaStoreIds, null /* filePaths */,
+ notificationUris, null /* parentId */, (limit - result.getCount()),
+ false /* includePending */);
} finally {
IoUtils.closeQuietly(cursor);
Binder.restoreCallingIdentity(token);
diff --git a/ui/res/values-da/strings.xml b/ui/res/values-da/strings.xml
index 9bb52af1..be58a787 100644
--- a/ui/res/values-da/strings.xml
+++ b/ui/res/values-da/strings.xml
@@ -21,7 +21,7 @@
<string name="download_title_sorted_by_size" msgid="1417193166677094813">"Downloads – sorter efter størrelse"</string>
<string name="no_downloads" msgid="1029667411186146836">"Ingen downloads."</string>
<string name="missing_title" msgid="830115697868833773">"&lt;Ukendt&gt;"</string>
- <string name="button_sort_by_size" msgid="7331549713691146251">"Sorter efter størrelse"</string>
+ <string name="button_sort_by_size" msgid="7331549713691146251">"Sortér efter størrelse"</string>
<string name="button_sort_by_date" msgid="8800842892684101528">"Sorter efter dato"</string>
<string name="download_queued" msgid="104973307780629904">"I kø"</string>
<string name="download_running" msgid="4656462962155580641">"I gang"</string>
diff --git a/ui/res/values-hi/strings.xml b/ui/res/values-hi/strings.xml
index 04a8d000..0367c259 100644
--- a/ui/res/values-hi/strings.xml
+++ b/ui/res/values-hi/strings.xml
@@ -17,12 +17,12 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3070921713463294774">"डाउनलोड"</string>
- <string name="download_title_sorted_by_date" msgid="5898014492155434221">"डाउनलोड - दिनांक द्वारा क्रमित"</string>
+ <string name="download_title_sorted_by_date" msgid="5898014492155434221">"डाउनलोड - तारीख द्वारा क्रमित"</string>
<string name="download_title_sorted_by_size" msgid="1417193166677094813">"डाउनलोड - आकार द्वारा क्रमित"</string>
<string name="no_downloads" msgid="1029667411186146836">"कोई डाउनलोड नहीं."</string>
<string name="missing_title" msgid="830115697868833773">"&lt;अज्ञात&gt;"</string>
<string name="button_sort_by_size" msgid="7331549713691146251">"आकार द्वारा क्रमित करें"</string>
- <string name="button_sort_by_date" msgid="8800842892684101528">"दिनांक द्वारा क्रमित करें"</string>
+ <string name="button_sort_by_date" msgid="8800842892684101528">"तारीख द्वारा क्रमित करें"</string>
<string name="download_queued" msgid="104973307780629904">"कतार में"</string>
<string name="download_running" msgid="4656462962155580641">"जारी"</string>
<string name="download_success" msgid="7006048006543495236">"पूर्ण"</string>
@@ -42,7 +42,7 @@
<string name="delete_download" msgid="76629022653866471">"मिटाएं"</string>
<string name="keep_queued_download" msgid="5144882786014818569">"रखें"</string>
<string name="cancel_running_download" msgid="5232704030969221112">"रद्द करें"</string>
- <string name="retry_download" msgid="7617100787922717912">"पुन: प्रयास करें"</string>
+ <string name="retry_download" msgid="7617100787922717912">"फिर से प्रयास करें"</string>
<string name="start_now_download" msgid="1564642872809509681">"अभी शुरू करें"</string>
<string name="deselect_all" msgid="6348198946254776764">"कुछ भी ना चुनें"</string>
<string name="select_all" msgid="634074918366265804">"सभी चुनें"</string>
diff --git a/ui/res/values-kk/strings.xml b/ui/res/values-kk/strings.xml
index 1b49bf7c..e410ed6a 100644
--- a/ui/res/values-kk/strings.xml
+++ b/ui/res/values-kk/strings.xml
@@ -16,7 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="3070921713463294774">"Жүктеулер"</string>
+ <string name="app_label" msgid="3070921713463294774">"Жүктеп алынған"</string>
<string name="download_title_sorted_by_date" msgid="5898014492155434221">"Жүктеулер - Мерзім бойынша сұрыпталған"</string>
<string name="download_title_sorted_by_size" msgid="1417193166677094813">"Жүктеулер - Өлшем бойынша сұрыпталған"</string>
<string name="no_downloads" msgid="1029667411186146836">"Жүктеулер жоқ."</string>
diff --git a/ui/res/values-uz/strings.xml b/ui/res/values-uz/strings.xml
index b83943a3..7b7438c3 100644
--- a/ui/res/values-uz/strings.xml
+++ b/ui/res/values-uz/strings.xml
@@ -21,7 +21,7 @@
<string name="download_title_sorted_by_size" msgid="1417193166677094813">"Yuklanmalar – hajmi bo‘yicha"</string>
<string name="no_downloads" msgid="1029667411186146836">"Yuklanmalar yo‘q."</string>
<string name="missing_title" msgid="830115697868833773">"&lt;Noma’lum&gt;"</string>
- <string name="button_sort_by_size" msgid="7331549713691146251">"Hajmi bo‘yicha saralash"</string>
+ <string name="button_sort_by_size" msgid="7331549713691146251">"Hajmi asosida saralash"</string>
<string name="button_sort_by_date" msgid="8800842892684101528">"Sanasi bo‘yicha saralash"</string>
<string name="download_queued" msgid="104973307780629904">"Navbatda"</string>
<string name="download_running" msgid="4656462962155580641">"Yuk. amalda"</string>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-17 11:23:01 +0000