summaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
Diffstat (limited to 'ui')
-rw-r--r--ui/res/layout/download_list.xml2
-rw-r--r--ui/res/values-ar/strings.xml2
-rw-r--r--ui/res/values-bg/strings.xml2
-rw-r--r--ui/res/values-ca/strings.xml2
-rw-r--r--ui/res/values-cs/strings.xml2
-rw-r--r--ui/res/values-da/strings.xml2
-rw-r--r--ui/res/values-de/strings.xml2
-rw-r--r--ui/res/values-el/strings.xml2
-rw-r--r--ui/res/values-en-rGB/strings.xml2
-rw-r--r--ui/res/values-es-rUS/strings.xml6
-rw-r--r--ui/res/values-es/strings.xml2
-rw-r--r--ui/res/values-fa/strings.xml2
-rw-r--r--ui/res/values-fi/strings.xml2
-rw-r--r--ui/res/values-fr/strings.xml2
-rw-r--r--ui/res/values-hr/strings.xml2
-rw-r--r--ui/res/values-hu/strings.xml2
-rw-r--r--ui/res/values-in/strings.xml2
-rw-r--r--ui/res/values-it/strings.xml2
-rw-r--r--ui/res/values-iw/strings.xml2
-rw-r--r--ui/res/values-ja/strings.xml2
-rw-r--r--ui/res/values-ko/strings.xml2
-rw-r--r--ui/res/values-lt/strings.xml2
-rw-r--r--ui/res/values-lv/strings.xml2
-rw-r--r--ui/res/values-nb/strings.xml2
-rw-r--r--ui/res/values-nl/strings.xml2
-rw-r--r--ui/res/values-pl/strings.xml2
-rw-r--r--ui/res/values-pt-rPT/strings.xml2
-rw-r--r--ui/res/values-pt/strings.xml2
-rw-r--r--ui/res/values-ro/strings.xml2
-rw-r--r--ui/res/values-ru/strings.xml2
-rw-r--r--ui/res/values-sk/strings.xml2
-rw-r--r--ui/res/values-sl/strings.xml2
-rw-r--r--ui/res/values-sr/strings.xml2
-rw-r--r--ui/res/values-sv/strings.xml2
-rw-r--r--ui/res/values-th/strings.xml2
-rw-r--r--ui/res/values-tl/strings.xml2
-rw-r--r--ui/res/values-tr/strings.xml2
-rw-r--r--ui/res/values-uk/strings.xml2
-rw-r--r--ui/res/values-vi/strings.xml2
-rw-r--r--ui/res/values-zh-rCN/strings.xml2
-rw-r--r--ui/res/values-zh-rTW/strings.xml2
-rw-r--r--ui/res/values/strings.xml2
-rw-r--r--ui/src/com/android/providers/downloads/ui/DateSortedDownloadAdapter.java8
-rw-r--r--ui/src/com/android/providers/downloads/ui/DateSortedExpandableListAdapter.java13
-rw-r--r--ui/src/com/android/providers/downloads/ui/DownloadList.java26
45 files changed, 74 insertions, 61 deletions
diff --git a/ui/res/layout/download_list.xml b/ui/res/layout/download_list.xml
index a49cf22a..18f44d10 100644
--- a/ui/res/layout/download_list.xml
+++ b/ui/res/layout/download_list.xml
@@ -55,7 +55,7 @@
<!-- The selection menu that pops up from the bottom of the screen -->
<LinearLayout android:id="@+id/sort_menu"
android:orientation="horizontal"
- android:layout_width="wrap_content"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
style="?android:attr/buttonBarStyle">
diff --git a/ui/res/values-ar/strings.xml b/ui/res/values-ar/strings.xml
index 54c33219..88079061 100644
--- a/ui/res/values-ar/strings.xml
+++ b/ui/res/values-ar/strings.xml
@@ -50,7 +50,7 @@
<!-- outdated translation 1809608640021589431 --> <string name="deselect_all" msgid="7986832738563338661">"محو التحديد"</string>
<!-- no translation found for select_all (5854385570247421586) -->
<skip />
- <!-- no translation found for selected_count (223679545214294432) -->
+ <!-- no translation found for selected_count (2101564570019753277) -->
<skip />
<!-- no translation found for download_share_dialog (3355867339806448955) -->
<skip />
diff --git a/ui/res/values-bg/strings.xml b/ui/res/values-bg/strings.xml
index 02ca449f..0eb3fb02 100644
--- a/ui/res/values-bg/strings.xml
+++ b/ui/res/values-bg/strings.xml
@@ -50,7 +50,7 @@
<!-- outdated translation 1809608640021589431 --> <string name="deselect_all" msgid="7986832738563338661">"Изчистване на избора"</string>
<!-- no translation found for select_all (5854385570247421586) -->
<skip />
- <!-- no translation found for selected_count (223679545214294432) -->
+ <!-- no translation found for selected_count (2101564570019753277) -->
<skip />
<!-- no translation found for download_share_dialog (3355867339806448955) -->
<skip />
diff --git a/ui/res/values-ca/strings.xml b/ui/res/values-ca/strings.xml
index c97c6372..05ec08d3 100644
--- a/ui/res/values-ca/strings.xml
+++ b/ui/res/values-ca/strings.xml
@@ -50,7 +50,7 @@
<!-- outdated translation 1809608640021589431 --> <string name="deselect_all" msgid="7986832738563338661">"Esborra la selecció"</string>
<!-- no translation found for select_all (5854385570247421586) -->
<skip />
- <!-- no translation found for selected_count (223679545214294432) -->
+ <!-- no translation found for selected_count (2101564570019753277) -->
<skip />
<!-- no translation found for download_share_dialog (3355867339806448955) -->
<skip />
diff --git a/ui/res/values-cs/strings.xml b/ui/res/values-cs/strings.xml
index 3d2b8d72..d6c6259f 100644
--- a/ui/res/values-cs/strings.xml
+++ b/ui/res/values-cs/strings.xml
@@ -50,7 +50,7 @@
<!-- outdated translation 1809608640021589431 --> <string name="deselect_all" msgid="7986832738563338661">"Zrušit výběr všech"</string>
<!-- no translation found for select_all (5854385570247421586) -->
<skip />
- <!-- no translation found for selected_count (223679545214294432) -->
+ <!-- no translation found for selected_count (2101564570019753277) -->
<skip />
<!-- no translation found for download_share_dialog (3355867339806448955) -->
<skip />
diff --git a/ui/res/values-da/strings.xml b/ui/res/values-da/strings.xml
index c24772e3..6f2af71d 100644
--- a/ui/res/values-da/strings.xml
+++ b/ui/res/values-da/strings.xml
@@ -50,7 +50,7 @@
<!-- outdated translation 1809608640021589431 --> <string name="deselect_all" msgid="7986832738563338661">"Ryd valgte"</string>
<!-- no translation found for select_all (5854385570247421586) -->
<skip />
- <!-- no translation found for selected_count (223679545214294432) -->
+ <!-- no translation found for selected_count (2101564570019753277) -->
<skip />
<!-- no translation found for download_share_dialog (3355867339806448955) -->
<skip />
diff --git a/ui/res/values-de/strings.xml b/ui/res/values-de/strings.xml
index 333a63e5..1d6320eb 100644
--- a/ui/res/values-de/strings.xml
+++ b/ui/res/values-de/strings.xml
@@ -50,7 +50,7 @@
<!-- outdated translation 1809608640021589431 --> <string name="deselect_all" msgid="7986832738563338661">"Auswahl aufheben"</string>
<!-- no translation found for select_all (5854385570247421586) -->
<skip />
- <!-- no translation found for selected_count (223679545214294432) -->
+ <!-- no translation found for selected_count (2101564570019753277) -->
<skip />
<!-- no translation found for download_share_dialog (3355867339806448955) -->
<skip />
diff --git a/ui/res/values-el/strings.xml b/ui/res/values-el/strings.xml
index 0f107e77..9d65ad89 100644
--- a/ui/res/values-el/strings.xml
+++ b/ui/res/values-el/strings.xml
@@ -50,7 +50,7 @@
<!-- outdated translation 1809608640021589431 --> <string name="deselect_all" msgid="7986832738563338661">"Εκκαθάριση επιλογής"</string>
<!-- no translation found for select_all (5854385570247421586) -->
<skip />
- <!-- no translation found for selected_count (223679545214294432) -->
+ <!-- no translation found for selected_count (2101564570019753277) -->
<skip />
<!-- no translation found for download_share_dialog (3355867339806448955) -->
<skip />
diff --git a/ui/res/values-en-rGB/strings.xml b/ui/res/values-en-rGB/strings.xml
index 8d9bb722..c548a0b0 100644
--- a/ui/res/values-en-rGB/strings.xml
+++ b/ui/res/values-en-rGB/strings.xml
@@ -50,7 +50,7 @@
<!-- outdated translation 1809608640021589431 --> <string name="deselect_all" msgid="7986832738563338661">"Clear selection"</string>
<!-- no translation found for select_all (5854385570247421586) -->
<skip />
- <!-- no translation found for selected_count (223679545214294432) -->
+ <!-- no translation found for selected_count (2101564570019753277) -->
<skip />
<!-- no translation found for download_share_dialog (3355867339806448955) -->
<skip />
diff --git a/ui/res/values-es-rUS/strings.xml b/ui/res/values-es-rUS/strings.xml
index f4acfae4..104a60e2 100644
--- a/ui/res/values-es-rUS/strings.xml
+++ b/ui/res/values-es-rUS/strings.xml
@@ -27,7 +27,7 @@
<skip />
<!-- no translation found for button_sort_by_date (8800842892684101528) -->
<skip />
- <string name="download_queued" msgid="104973307780629904">"Citado"</string>
+ <string name="download_queued" msgid="104973307780629904">"En cola"</string>
<string name="download_running" msgid="4656462962155580641">"En progreso"</string>
<string name="download_success" msgid="7006048006543495236">"Completa"</string>
<string name="download_error" msgid="3107369653921738690">"Error"</string>
@@ -35,7 +35,7 @@
<string name="dialog_failed_body" msgid="587545111677064427">"¿Deseas intentar descargar el archivo más tarde o eliminarlo de la cola?"</string>
<string name="dialog_title_queued_body" msgid="3062862079904954824">"Archivo no disponible aún"</string>
<string name="dialog_queued_body" msgid="2506935748423351902">"Este archivo está en cola para descargas futuras."</string>
- <string name="dialog_file_missing_body" msgid="2783781332668129395">"No podemos encontrar el archivo que se descargó."</string>
+ <string name="dialog_file_missing_body" msgid="2783781332668129395">"No se puede encontrar el archivo descargado."</string>
<string name="dialog_insufficient_space_on_external" msgid="7534108515812329821">"No se puede finalizar la descarga. No hay suficiente espacio de almacenamiento externo."</string>
<string name="dialog_insufficient_space_on_cache" msgid="8387210487235302129">"No se puede finalizar la descarga. No hay suficiente espacio de almacenamiento interno."</string>
<string name="dialog_cannot_resume" msgid="7704082031608361756">"Descarga interrumpida. No se puede retomar."</string>
@@ -50,7 +50,7 @@
<!-- outdated translation 1809608640021589431 --> <string name="deselect_all" msgid="7986832738563338661">"Borrar selección"</string>
<!-- no translation found for select_all (5854385570247421586) -->
<skip />
- <!-- no translation found for selected_count (223679545214294432) -->
+ <!-- no translation found for selected_count (2101564570019753277) -->
<skip />
<!-- no translation found for download_share_dialog (3355867339806448955) -->
<skip />
diff --git a/ui/res/values-es/strings.xml b/ui/res/values-es/strings.xml
index 2f780e09..aa668d8f 100644
--- a/ui/res/values-es/strings.xml
+++ b/ui/res/values-es/strings.xml
@@ -50,7 +50,7 @@
<!-- outdated translation 1809608640021589431 --> <string name="deselect_all" msgid="7986832738563338661">"Borrar selección"</string>
<!-- no translation found for select_all (5854385570247421586) -->
<skip />
- <!-- no translation found for selected_count (223679545214294432) -->
+ <!-- no translation found for selected_count (2101564570019753277) -->
<skip />
<!-- no translation found for download_share_dialog (3355867339806448955) -->
<skip />
diff --git a/ui/res/values-fa/strings.xml b/ui/res/values-fa/strings.xml
index 9c778ab4..3f10214f 100644
--- a/ui/res/values-fa/strings.xml
+++ b/ui/res/values-fa/strings.xml
@@ -50,7 +50,7 @@
<!-- outdated translation 1809608640021589431 --> <string name="deselect_all" msgid="7986832738563338661">"پاک کردن انتخاب"</string>
<!-- no translation found for select_all (5854385570247421586) -->
<skip />
- <!-- no translation found for selected_count (223679545214294432) -->
+ <!-- no translation found for selected_count (2101564570019753277) -->
<skip />
<!-- no translation found for download_share_dialog (3355867339806448955) -->
<skip />
diff --git a/ui/res/values-fi/strings.xml b/ui/res/values-fi/strings.xml
index 5802bdaa..dfa40277 100644
--- a/ui/res/values-fi/strings.xml
+++ b/ui/res/values-fi/strings.xml
@@ -50,7 +50,7 @@
<!-- outdated translation 1809608640021589431 --> <string name="deselect_all" msgid="7986832738563338661">"Tyhjennä valinta"</string>
<!-- no translation found for select_all (5854385570247421586) -->
<skip />
- <!-- no translation found for selected_count (223679545214294432) -->
+ <!-- no translation found for selected_count (2101564570019753277) -->
<skip />
<!-- no translation found for download_share_dialog (3355867339806448955) -->
<skip />
diff --git a/ui/res/values-fr/strings.xml b/ui/res/values-fr/strings.xml
index 20ef9c77..9a87f653 100644
--- a/ui/res/values-fr/strings.xml
+++ b/ui/res/values-fr/strings.xml
@@ -50,7 +50,7 @@
<!-- outdated translation 1809608640021589431 --> <string name="deselect_all" msgid="7986832738563338661">"Effacer la sélection"</string>
<!-- no translation found for select_all (5854385570247421586) -->
<skip />
- <!-- no translation found for selected_count (223679545214294432) -->
+ <!-- no translation found for selected_count (2101564570019753277) -->
<skip />
<!-- no translation found for download_share_dialog (3355867339806448955) -->
<skip />
diff --git a/ui/res/values-hr/strings.xml b/ui/res/values-hr/strings.xml
index 678eeea2..dd685d85 100644
--- a/ui/res/values-hr/strings.xml
+++ b/ui/res/values-hr/strings.xml
@@ -50,7 +50,7 @@
<!-- outdated translation 1809608640021589431 --> <string name="deselect_all" msgid="7986832738563338661">"Izbriši odabir"</string>
<!-- no translation found for select_all (5854385570247421586) -->
<skip />
- <!-- no translation found for selected_count (223679545214294432) -->
+ <!-- no translation found for selected_count (2101564570019753277) -->
<skip />
<!-- no translation found for download_share_dialog (3355867339806448955) -->
<skip />
diff --git a/ui/res/values-hu/strings.xml b/ui/res/values-hu/strings.xml
index adf6e5b2..4448079b 100644
--- a/ui/res/values-hu/strings.xml
+++ b/ui/res/values-hu/strings.xml
@@ -50,7 +50,7 @@
<!-- outdated translation 1809608640021589431 --> <string name="deselect_all" msgid="7986832738563338661">"Kijelölés törlése"</string>
<!-- no translation found for select_all (5854385570247421586) -->
<skip />
- <!-- no translation found for selected_count (223679545214294432) -->
+ <!-- no translation found for selected_count (2101564570019753277) -->
<skip />
<!-- no translation found for download_share_dialog (3355867339806448955) -->
<skip />
diff --git a/ui/res/values-in/strings.xml b/ui/res/values-in/strings.xml
index aac62bb7..6e916e53 100644
--- a/ui/res/values-in/strings.xml
+++ b/ui/res/values-in/strings.xml
@@ -50,7 +50,7 @@
<!-- outdated translation 1809608640021589431 --> <string name="deselect_all" msgid="7986832738563338661">"Hapus pilihan"</string>
<!-- no translation found for select_all (5854385570247421586) -->
<skip />
- <!-- no translation found for selected_count (223679545214294432) -->
+ <!-- no translation found for selected_count (2101564570019753277) -->
<skip />
<!-- no translation found for download_share_dialog (3355867339806448955) -->
<skip />
diff --git a/ui/res/values-it/strings.xml b/ui/res/values-it/strings.xml
index 7c9ada49..2c802717 100644
--- a/ui/res/values-it/strings.xml
+++ b/ui/res/values-it/strings.xml
@@ -50,7 +50,7 @@
<!-- outdated translation 1809608640021589431 --> <string name="deselect_all" msgid="7986832738563338661">"Annulla selezione"</string>
<!-- no translation found for select_all (5854385570247421586) -->
<skip />
- <!-- no translation found for selected_count (223679545214294432) -->
+ <!-- no translation found for selected_count (2101564570019753277) -->
<skip />
<!-- no translation found for download_share_dialog (3355867339806448955) -->
<skip />
diff --git a/ui/res/values-iw/strings.xml b/ui/res/values-iw/strings.xml
index 88d750ee..9c56d016 100644
--- a/ui/res/values-iw/strings.xml
+++ b/ui/res/values-iw/strings.xml
@@ -50,7 +50,7 @@
<!-- outdated translation 1809608640021589431 --> <string name="deselect_all" msgid="7986832738563338661">"נקה בחירה"</string>
<!-- no translation found for select_all (5854385570247421586) -->
<skip />
- <!-- no translation found for selected_count (223679545214294432) -->
+ <!-- no translation found for selected_count (2101564570019753277) -->
<skip />
<!-- no translation found for download_share_dialog (3355867339806448955) -->
<skip />
diff --git a/ui/res/values-ja/strings.xml b/ui/res/values-ja/strings.xml
index f28ee662..66c7744c 100644
--- a/ui/res/values-ja/strings.xml
+++ b/ui/res/values-ja/strings.xml
@@ -50,7 +50,7 @@
<!-- outdated translation 1809608640021589431 --> <string name="deselect_all" msgid="7986832738563338661">"選択を解除"</string>
<!-- no translation found for select_all (5854385570247421586) -->
<skip />
- <!-- no translation found for selected_count (223679545214294432) -->
+ <!-- no translation found for selected_count (2101564570019753277) -->
<skip />
<!-- no translation found for download_share_dialog (3355867339806448955) -->
<skip />
diff --git a/ui/res/values-ko/strings.xml b/ui/res/values-ko/strings.xml
index ee695dc0..f401309d 100644
--- a/ui/res/values-ko/strings.xml
+++ b/ui/res/values-ko/strings.xml
@@ -50,7 +50,7 @@
<!-- outdated translation 1809608640021589431 --> <string name="deselect_all" msgid="7986832738563338661">"선택 취소"</string>
<!-- no translation found for select_all (5854385570247421586) -->
<skip />
- <!-- no translation found for selected_count (223679545214294432) -->
+ <!-- no translation found for selected_count (2101564570019753277) -->
<skip />
<!-- no translation found for download_share_dialog (3355867339806448955) -->
<skip />
diff --git a/ui/res/values-lt/strings.xml b/ui/res/values-lt/strings.xml
index ca3d0eaf..759b7562 100644
--- a/ui/res/values-lt/strings.xml
+++ b/ui/res/values-lt/strings.xml
@@ -50,7 +50,7 @@
<!-- outdated translation 1809608640021589431 --> <string name="deselect_all" msgid="7986832738563338661">"Išvalyti pasirinkimą"</string>
<!-- no translation found for select_all (5854385570247421586) -->
<skip />
- <!-- no translation found for selected_count (223679545214294432) -->
+ <!-- no translation found for selected_count (2101564570019753277) -->
<skip />
<!-- no translation found for download_share_dialog (3355867339806448955) -->
<skip />
diff --git a/ui/res/values-lv/strings.xml b/ui/res/values-lv/strings.xml
index c7ee3534..5a033983 100644
--- a/ui/res/values-lv/strings.xml
+++ b/ui/res/values-lv/strings.xml
@@ -50,7 +50,7 @@
<!-- outdated translation 1809608640021589431 --> <string name="deselect_all" msgid="7986832738563338661">"Notīrīt atlasi"</string>
<!-- no translation found for select_all (5854385570247421586) -->
<skip />
- <!-- no translation found for selected_count (223679545214294432) -->
+ <!-- no translation found for selected_count (2101564570019753277) -->
<skip />
<!-- no translation found for download_share_dialog (3355867339806448955) -->
<skip />
diff --git a/ui/res/values-nb/strings.xml b/ui/res/values-nb/strings.xml
index 7546df6b..a6ca2185 100644
--- a/ui/res/values-nb/strings.xml
+++ b/ui/res/values-nb/strings.xml
@@ -50,7 +50,7 @@
<!-- outdated translation 1809608640021589431 --> <string name="deselect_all" msgid="7986832738563338661">"Slett valg"</string>
<!-- no translation found for select_all (5854385570247421586) -->
<skip />
- <!-- no translation found for selected_count (223679545214294432) -->
+ <!-- no translation found for selected_count (2101564570019753277) -->
<skip />
<!-- no translation found for download_share_dialog (3355867339806448955) -->
<skip />
diff --git a/ui/res/values-nl/strings.xml b/ui/res/values-nl/strings.xml
index aac583a1..650437e6 100644
--- a/ui/res/values-nl/strings.xml
+++ b/ui/res/values-nl/strings.xml
@@ -50,7 +50,7 @@
<!-- outdated translation 1809608640021589431 --> <string name="deselect_all" msgid="7986832738563338661">"Selectie wissen"</string>
<!-- no translation found for select_all (5854385570247421586) -->
<skip />
- <!-- no translation found for selected_count (223679545214294432) -->
+ <!-- no translation found for selected_count (2101564570019753277) -->
<skip />
<!-- no translation found for download_share_dialog (3355867339806448955) -->
<skip />
diff --git a/ui/res/values-pl/strings.xml b/ui/res/values-pl/strings.xml
index 55bd2bfe..df2720f7 100644
--- a/ui/res/values-pl/strings.xml
+++ b/ui/res/values-pl/strings.xml
@@ -50,7 +50,7 @@
<!-- outdated translation 1809608640021589431 --> <string name="deselect_all" msgid="7986832738563338661">"Usuń zaznaczenie"</string>
<!-- no translation found for select_all (5854385570247421586) -->
<skip />
- <!-- no translation found for selected_count (223679545214294432) -->
+ <!-- no translation found for selected_count (2101564570019753277) -->
<skip />
<!-- no translation found for download_share_dialog (3355867339806448955) -->
<skip />
diff --git a/ui/res/values-pt-rPT/strings.xml b/ui/res/values-pt-rPT/strings.xml
index 6ef104ff..33d49a22 100644
--- a/ui/res/values-pt-rPT/strings.xml
+++ b/ui/res/values-pt-rPT/strings.xml
@@ -50,7 +50,7 @@
<!-- outdated translation 1809608640021589431 --> <string name="deselect_all" msgid="7986832738563338661">"Limpar selecção"</string>
<!-- no translation found for select_all (5854385570247421586) -->
<skip />
- <!-- no translation found for selected_count (223679545214294432) -->
+ <!-- no translation found for selected_count (2101564570019753277) -->
<skip />
<!-- no translation found for download_share_dialog (3355867339806448955) -->
<skip />
diff --git a/ui/res/values-pt/strings.xml b/ui/res/values-pt/strings.xml
index 197d0df7..a483f643 100644
--- a/ui/res/values-pt/strings.xml
+++ b/ui/res/values-pt/strings.xml
@@ -50,7 +50,7 @@
<!-- outdated translation 1809608640021589431 --> <string name="deselect_all" msgid="7986832738563338661">"Limpar seleção"</string>
<!-- no translation found for select_all (5854385570247421586) -->
<skip />
- <!-- no translation found for selected_count (223679545214294432) -->
+ <!-- no translation found for selected_count (2101564570019753277) -->
<skip />
<!-- no translation found for download_share_dialog (3355867339806448955) -->
<skip />
diff --git a/ui/res/values-ro/strings.xml b/ui/res/values-ro/strings.xml
index 15100ea8..d0d93815 100644
--- a/ui/res/values-ro/strings.xml
+++ b/ui/res/values-ro/strings.xml
@@ -50,7 +50,7 @@
<!-- outdated translation 1809608640021589431 --> <string name="deselect_all" msgid="7986832738563338661">"Ştergeţi selectarea"</string>
<!-- no translation found for select_all (5854385570247421586) -->
<skip />
- <!-- no translation found for selected_count (223679545214294432) -->
+ <!-- no translation found for selected_count (2101564570019753277) -->
<skip />
<!-- no translation found for download_share_dialog (3355867339806448955) -->
<skip />
diff --git a/ui/res/values-ru/strings.xml b/ui/res/values-ru/strings.xml
index 3d496f61..5fe5dea1 100644
--- a/ui/res/values-ru/strings.xml
+++ b/ui/res/values-ru/strings.xml
@@ -50,7 +50,7 @@
<!-- outdated translation 1809608640021589431 --> <string name="deselect_all" msgid="7986832738563338661">"Снять выделение"</string>
<!-- no translation found for select_all (5854385570247421586) -->
<skip />
- <!-- no translation found for selected_count (223679545214294432) -->
+ <!-- no translation found for selected_count (2101564570019753277) -->
<skip />
<!-- no translation found for download_share_dialog (3355867339806448955) -->
<skip />
diff --git a/ui/res/values-sk/strings.xml b/ui/res/values-sk/strings.xml
index c1fe604f..afafcfb2 100644
--- a/ui/res/values-sk/strings.xml
+++ b/ui/res/values-sk/strings.xml
@@ -50,7 +50,7 @@
<!-- outdated translation 1809608640021589431 --> <string name="deselect_all" msgid="7986832738563338661">"Zrušiť výber všetkých"</string>
<!-- no translation found for select_all (5854385570247421586) -->
<skip />
- <!-- no translation found for selected_count (223679545214294432) -->
+ <!-- no translation found for selected_count (2101564570019753277) -->
<skip />
<!-- no translation found for download_share_dialog (3355867339806448955) -->
<skip />
diff --git a/ui/res/values-sl/strings.xml b/ui/res/values-sl/strings.xml
index 302a4044..384160d4 100644
--- a/ui/res/values-sl/strings.xml
+++ b/ui/res/values-sl/strings.xml
@@ -50,7 +50,7 @@
<!-- outdated translation 1809608640021589431 --> <string name="deselect_all" msgid="7986832738563338661">"Počisti izbor"</string>
<!-- no translation found for select_all (5854385570247421586) -->
<skip />
- <!-- no translation found for selected_count (223679545214294432) -->
+ <!-- no translation found for selected_count (2101564570019753277) -->
<skip />
<!-- no translation found for download_share_dialog (3355867339806448955) -->
<skip />
diff --git a/ui/res/values-sr/strings.xml b/ui/res/values-sr/strings.xml
index e54bb4d6..a525d1e8 100644
--- a/ui/res/values-sr/strings.xml
+++ b/ui/res/values-sr/strings.xml
@@ -50,7 +50,7 @@
<!-- outdated translation 1809608640021589431 --> <string name="deselect_all" msgid="7986832738563338661">"Обриши избор."</string>
<!-- no translation found for select_all (5854385570247421586) -->
<skip />
- <!-- no translation found for selected_count (223679545214294432) -->
+ <!-- no translation found for selected_count (2101564570019753277) -->
<skip />
<!-- no translation found for download_share_dialog (3355867339806448955) -->
<skip />
diff --git a/ui/res/values-sv/strings.xml b/ui/res/values-sv/strings.xml
index 8f74a0cb..60d2c565 100644
--- a/ui/res/values-sv/strings.xml
+++ b/ui/res/values-sv/strings.xml
@@ -50,7 +50,7 @@
<!-- outdated translation 1809608640021589431 --> <string name="deselect_all" msgid="7986832738563338661">"Ta bort markerade"</string>
<!-- no translation found for select_all (5854385570247421586) -->
<skip />
- <!-- no translation found for selected_count (223679545214294432) -->
+ <!-- no translation found for selected_count (2101564570019753277) -->
<skip />
<!-- no translation found for download_share_dialog (3355867339806448955) -->
<skip />
diff --git a/ui/res/values-th/strings.xml b/ui/res/values-th/strings.xml
index 29af7b19..c77ef185 100644
--- a/ui/res/values-th/strings.xml
+++ b/ui/res/values-th/strings.xml
@@ -50,7 +50,7 @@
<!-- outdated translation 1809608640021589431 --> <string name="deselect_all" msgid="7986832738563338661">"ล้างการเลือก"</string>
<!-- no translation found for select_all (5854385570247421586) -->
<skip />
- <!-- no translation found for selected_count (223679545214294432) -->
+ <!-- no translation found for selected_count (2101564570019753277) -->
<skip />
<!-- no translation found for download_share_dialog (3355867339806448955) -->
<skip />
diff --git a/ui/res/values-tl/strings.xml b/ui/res/values-tl/strings.xml
index c3139035..44efb37c 100644
--- a/ui/res/values-tl/strings.xml
+++ b/ui/res/values-tl/strings.xml
@@ -50,7 +50,7 @@
<!-- outdated translation 1809608640021589431 --> <string name="deselect_all" msgid="7986832738563338661">"I-clear ang pagpipilian"</string>
<!-- no translation found for select_all (5854385570247421586) -->
<skip />
- <!-- no translation found for selected_count (223679545214294432) -->
+ <!-- no translation found for selected_count (2101564570019753277) -->
<skip />
<!-- no translation found for download_share_dialog (3355867339806448955) -->
<skip />
diff --git a/ui/res/values-tr/strings.xml b/ui/res/values-tr/strings.xml
index c4354e74..ac73d7a3 100644
--- a/ui/res/values-tr/strings.xml
+++ b/ui/res/values-tr/strings.xml
@@ -50,7 +50,7 @@
<!-- outdated translation 1809608640021589431 --> <string name="deselect_all" msgid="7986832738563338661">"Seçimi temizle"</string>
<!-- no translation found for select_all (5854385570247421586) -->
<skip />
- <!-- no translation found for selected_count (223679545214294432) -->
+ <!-- no translation found for selected_count (2101564570019753277) -->
<skip />
<!-- no translation found for download_share_dialog (3355867339806448955) -->
<skip />
diff --git a/ui/res/values-uk/strings.xml b/ui/res/values-uk/strings.xml
index ac0f5bb8..65772405 100644
--- a/ui/res/values-uk/strings.xml
+++ b/ui/res/values-uk/strings.xml
@@ -50,7 +50,7 @@
<!-- outdated translation 1809608640021589431 --> <string name="deselect_all" msgid="7986832738563338661">"Очистити вибір"</string>
<!-- no translation found for select_all (5854385570247421586) -->
<skip />
- <!-- no translation found for selected_count (223679545214294432) -->
+ <!-- no translation found for selected_count (2101564570019753277) -->
<skip />
<!-- no translation found for download_share_dialog (3355867339806448955) -->
<skip />
diff --git a/ui/res/values-vi/strings.xml b/ui/res/values-vi/strings.xml
index 9777593e..f8d3fd3e 100644
--- a/ui/res/values-vi/strings.xml
+++ b/ui/res/values-vi/strings.xml
@@ -50,7 +50,7 @@
<!-- outdated translation 1809608640021589431 --> <string name="deselect_all" msgid="7986832738563338661">"Xóa lựa chọn"</string>
<!-- no translation found for select_all (5854385570247421586) -->
<skip />
- <!-- no translation found for selected_count (223679545214294432) -->
+ <!-- no translation found for selected_count (2101564570019753277) -->
<skip />
<!-- no translation found for download_share_dialog (3355867339806448955) -->
<skip />
diff --git a/ui/res/values-zh-rCN/strings.xml b/ui/res/values-zh-rCN/strings.xml
index bf69b1cd..eaba3fe5 100644
--- a/ui/res/values-zh-rCN/strings.xml
+++ b/ui/res/values-zh-rCN/strings.xml
@@ -50,7 +50,7 @@
<!-- outdated translation 1809608640021589431 --> <string name="deselect_all" msgid="7986832738563338661">"清除所选项"</string>
<!-- no translation found for select_all (5854385570247421586) -->
<skip />
- <!-- no translation found for selected_count (223679545214294432) -->
+ <!-- no translation found for selected_count (2101564570019753277) -->
<skip />
<!-- no translation found for download_share_dialog (3355867339806448955) -->
<skip />
diff --git a/ui/res/values-zh-rTW/strings.xml b/ui/res/values-zh-rTW/strings.xml
index 31f02b68..d3dfa0ad 100644
--- a/ui/res/values-zh-rTW/strings.xml
+++ b/ui/res/values-zh-rTW/strings.xml
@@ -50,7 +50,7 @@
<!-- outdated translation 1809608640021589431 --> <string name="deselect_all" msgid="7986832738563338661">"取消選取"</string>
<!-- no translation found for select_all (5854385570247421586) -->
<skip />
- <!-- no translation found for selected_count (223679545214294432) -->
+ <!-- no translation found for selected_count (2101564570019753277) -->
<skip />
<!-- no translation found for download_share_dialog (3355867339806448955) -->
<skip />
diff --git a/ui/res/values/strings.xml b/ui/res/values/strings.xml
index 90095231..4856531f 100644
--- a/ui/res/values/strings.xml
+++ b/ui/res/values/strings.xml
@@ -112,7 +112,7 @@
<!-- Text for menu to select all downloads in the download list [CHAR LIMIT=25] -->
<string name="select_all">Select All</string>
<!-- number of downloads selected [CHAR LIMIT=50] -->
- <string name="selected_count">Selected %1$d out of %2$d</string>
+ <string name="selected_count">Selected <xliff:g id="number" example="3">%1$d</xliff:g> out of <xliff:g id="total" example="15">%2$d</xliff:g></string>
<!-- title shown when displaying list of apps to choose from when share is clicked on
[CHAR LIMIT = 20] -->
<string name="download_share_dialog">Share via</string>
diff --git a/ui/src/com/android/providers/downloads/ui/DateSortedDownloadAdapter.java b/ui/src/com/android/providers/downloads/ui/DateSortedDownloadAdapter.java
index 8e93eab6..b69fb8b8 100644
--- a/ui/src/com/android/providers/downloads/ui/DateSortedDownloadAdapter.java
+++ b/ui/src/com/android/providers/downloads/ui/DateSortedDownloadAdapter.java
@@ -21,6 +21,7 @@ import android.app.DownloadManager;
import android.database.Cursor;
import android.view.View;
import android.view.ViewGroup;
+import android.widget.ExpandableListView;
import android.widget.RelativeLayout;
/**
@@ -28,12 +29,14 @@ import android.widget.RelativeLayout;
* {@link DownloadAdapter}.
*/
public class DateSortedDownloadAdapter extends DateSortedExpandableListAdapter {
- private DownloadAdapter mDelegate;
+ private final DownloadAdapter mDelegate;
+ private final DownloadList mDownloadList;
public DateSortedDownloadAdapter(DownloadList downloadList, Cursor cursor) {
super(downloadList, cursor,
cursor.getColumnIndexOrThrow(DownloadManager.COLUMN_LAST_MODIFIED_TIMESTAMP));
mDelegate = new DownloadAdapter(downloadList, cursor);
+ mDownloadList = downloadList;
}
@Override
@@ -49,7 +52,8 @@ public class DateSortedDownloadAdapter extends DateSortedExpandableListAdapter {
return convertView;
}
- int pos = getAbsolutePositionForGroupAndChildPositions(groupPosition, childPosition);
+ int pos = mDownloadList.getExpandableListView().getFlatListPosition(
+ ExpandableListView.getPackedPositionForChild(groupPosition, childPosition));
mDelegate.bindView(convertView, pos);
return convertView;
}
diff --git a/ui/src/com/android/providers/downloads/ui/DateSortedExpandableListAdapter.java b/ui/src/com/android/providers/downloads/ui/DateSortedExpandableListAdapter.java
index 73c51aef..19132a11 100644
--- a/ui/src/com/android/providers/downloads/ui/DateSortedExpandableListAdapter.java
+++ b/ui/src/com/android/providers/downloads/ui/DateSortedExpandableListAdapter.java
@@ -226,19 +226,6 @@ public class DateSortedExpandableListAdapter implements ExpandableListAdapter {
return arrayPosition;
}
- int getAbsolutePositionForGroupAndChildPositions(int groupPosition,
- int childPosition) {
- int bin = groupPositionToBin(groupPosition);
- int absolutePosition = 0;
- for (int j = 0; j < bin; j++) {
- if (mItemMap[j] > 0) {
- absolutePosition += mItemMap[j] + 1;
- }
- }
- absolutePosition += childPosition + 1;
- return absolutePosition;
- }
-
/**
* Move the cursor to the position indicated.
* @param packedPosition Position in packed position representation.
diff --git a/ui/src/com/android/providers/downloads/ui/DownloadList.java b/ui/src/com/android/providers/downloads/ui/DownloadList.java
index 4c8c36bb..810e93e6 100644
--- a/ui/src/com/android/providers/downloads/ui/DownloadList.java
+++ b/ui/src/com/android/providers/downloads/ui/DownloadList.java
@@ -103,8 +103,9 @@ public class DownloadList extends Activity {
return mMimeType;
}
}
- ListView mCurrentView;
- Cursor mCurrentCursor;
+ private ListView mCurrentView;
+ private Cursor mCurrentCursor;
+ private boolean mCurrentViewIsExpandableListView = false;
private boolean mIsSortedBySize = false;
/**
@@ -323,6 +324,17 @@ public class DownloadList extends Activity {
@Override
public void onItemCheckedStateChanged(ActionMode mode, int position, long id,
boolean checked) {
+ // ignore long clicks on groups
+ if (mDownloadList.isCurrentViewExpandableListView()) {
+ ExpandableListView ev = mDownloadList.getExpandableListView();
+ long pos = ev.getExpandableListPosition(position);
+ if (checked && (ExpandableListView.getPackedPositionType(pos) ==
+ ExpandableListView.PACKED_POSITION_TYPE_GROUP)) {
+ // ignore this click
+ ev.setItemChecked(position, false);
+ return;
+ }
+ }
mDownloadList.setActionModeTitle(mode);
}
}
@@ -428,17 +440,27 @@ public class DownloadList extends Activity {
return mCurrentView;
}
+ ExpandableListView getExpandableListView() {
+ return mDateOrderedListView;
+ }
+
+ boolean isCurrentViewExpandableListView() {
+ return mCurrentViewIsExpandableListView;
+ }
+
private ListView activeListView() {
if (mIsSortedBySize) {
mCurrentCursor = mSizeSortedCursor;
mCurrentView = mSizeOrderedListView;
setTitle(R.string.download_title_sorted_by_size);
mSortOption.setText(R.string.button_sort_by_date);
+ mCurrentViewIsExpandableListView = false;
} else {
mCurrentCursor = mDateSortedCursor;
mCurrentView = mDateOrderedListView;
setTitle(R.string.download_title_sorted_by_date);
mSortOption.setText(R.string.button_sort_by_size);
+ mCurrentViewIsExpandableListView = true;
}
if (mActionMode != null) {
mActionMode.finish();