Merge "Use correct classloader in State CREATOR." into nyc-andromeda-dev
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index f03ff79..d55249a 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -146,4 +146,6 @@
</plurals>
<string name="documents_shortcut_label" msgid="6185476684846785830">"Dokumente"</string>
<string name="downloads_shortcut_label" msgid="9109062409874698197">"Aflaaie"</string>
+ <!-- no translation found for archive_loading_failed (7243436722828766996) -->
+ <skip />
</resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index cd0cdeb..8fbcabb 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -146,4 +146,5 @@
</plurals>
<string name="documents_shortcut_label" msgid="6185476684846785830">"ሰነዶች"</string>
<string name="downloads_shortcut_label" msgid="9109062409874698197">"የወረዱ"</string>
+ <string name="archive_loading_failed" msgid="7243436722828766996">"ለአሰሳ ማህደርን ለመክፈት አልተቻለም። ፋይል አሊያም የተባለሸ ወይም የማይደገፍ ቅርጸት ያለው ነው።"</string>
</resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 3556450..38d1ed1 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -194,4 +194,6 @@
</plurals>
<string name="documents_shortcut_label" msgid="6185476684846785830">"المستندات"</string>
<string name="downloads_shortcut_label" msgid="9109062409874698197">"التنزيلات"</string>
+ <!-- no translation found for archive_loading_failed (7243436722828766996) -->
+ <skip />
</resources>
diff --git a/res/values-az-rAZ/strings.xml b/res/values-az-rAZ/strings.xml
index 1494095..c252e98 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-az-rAZ/strings.xml
@@ -146,4 +146,6 @@
</plurals>
<string name="documents_shortcut_label" msgid="6185476684846785830">"Sənədlər"</string>
<string name="downloads_shortcut_label" msgid="9109062409874698197">"Endirilənlər"</string>
+ <!-- no translation found for archive_loading_failed (7243436722828766996) -->
+ <skip />
</resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 322e860..b629a43 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -146,4 +146,6 @@
</plurals>
<string name="documents_shortcut_label" msgid="6185476684846785830">"Документи"</string>
<string name="downloads_shortcut_label" msgid="9109062409874698197">"Изтегляния"</string>
+ <!-- no translation found for archive_loading_failed (7243436722828766996) -->
+ <skip />
</resources>
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml
index 0b87ab5..d4b61be 100644
--- a/res/values-bn-rBD/strings.xml
+++ b/res/values-bn-rBD/strings.xml
@@ -146,4 +146,6 @@
</plurals>
<string name="documents_shortcut_label" msgid="6185476684846785830">"দস্তাবেজগুলি"</string>
<string name="downloads_shortcut_label" msgid="9109062409874698197">"ডাউনলোডগুলি"</string>
+ <!-- no translation found for archive_loading_failed (7243436722828766996) -->
+ <skip />
</resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 7177748..b442aac 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -146,4 +146,6 @@
</plurals>
<string name="documents_shortcut_label" msgid="6185476684846785830">"Documents"</string>
<string name="downloads_shortcut_label" msgid="9109062409874698197">"Baixades"</string>
+ <!-- no translation found for archive_loading_failed (7243436722828766996) -->
+ <skip />
</resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 37b0e64..06013ae 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -170,4 +170,6 @@
</plurals>
<string name="documents_shortcut_label" msgid="6185476684846785830">"Dokumenty"</string>
<string name="downloads_shortcut_label" msgid="9109062409874698197">"Stažené soubory"</string>
+ <!-- no translation found for archive_loading_failed (7243436722828766996) -->
+ <skip />
</resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 42ee82e..38f66cf 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -146,4 +146,5 @@
</plurals>
<string name="documents_shortcut_label" msgid="6185476684846785830">"Dokumenter"</string>
<string name="downloads_shortcut_label" msgid="9109062409874698197">"Downloads"</string>
+ <string name="archive_loading_failed" msgid="7243436722828766996">"Arkivet kunne ikke åbnes. Filen er enten beskadiget eller har et format, som ikke understøttes."</string>
</resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 165a846..32c16f8 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -146,4 +146,6 @@
</plurals>
<string name="documents_shortcut_label" msgid="6185476684846785830">"Dokumente"</string>
<string name="downloads_shortcut_label" msgid="9109062409874698197">"Downloads"</string>
+ <!-- no translation found for archive_loading_failed (7243436722828766996) -->
+ <skip />
</resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 58cb8a9..5080fe7 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -146,4 +146,5 @@
</plurals>
<string name="documents_shortcut_label" msgid="6185476684846785830">"Έγγραφα"</string>
<string name="downloads_shortcut_label" msgid="9109062409874698197">"Λήψεις"</string>
+ <string name="archive_loading_failed" msgid="7243436722828766996">"Δεν είναι δυνατό το άνοιγμα του αρχείου για περιήγηση. Το αρχείο είναι κατεστραμμένο ή η μορφή του δεν υποστηρίζεται."</string>
</resources>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 2b7275d..25c2733 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -146,4 +146,6 @@
</plurals>
<string name="documents_shortcut_label" msgid="6185476684846785830">"Documents"</string>
<string name="downloads_shortcut_label" msgid="9109062409874698197">"Downloads"</string>
+ <!-- no translation found for archive_loading_failed (7243436722828766996) -->
+ <skip />
</resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 2b7275d..25c2733 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -146,4 +146,6 @@
</plurals>
<string name="documents_shortcut_label" msgid="6185476684846785830">"Documents"</string>
<string name="downloads_shortcut_label" msgid="9109062409874698197">"Downloads"</string>
+ <!-- no translation found for archive_loading_failed (7243436722828766996) -->
+ <skip />
</resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 2b7275d..25c2733 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -146,4 +146,6 @@
</plurals>
<string name="documents_shortcut_label" msgid="6185476684846785830">"Documents"</string>
<string name="downloads_shortcut_label" msgid="9109062409874698197">"Downloads"</string>
+ <!-- no translation found for archive_loading_failed (7243436722828766996) -->
+ <skip />
</resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 8dc3af1..157ba8e 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -146,4 +146,6 @@
</plurals>
<string name="documents_shortcut_label" msgid="6185476684846785830">"Documentos"</string>
<string name="downloads_shortcut_label" msgid="9109062409874698197">"Descargas"</string>
+ <!-- no translation found for archive_loading_failed (7243436722828766996) -->
+ <skip />
</resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index b8b840b..df4f240 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -146,4 +146,5 @@
</plurals>
<string name="documents_shortcut_label" msgid="6185476684846785830">"Documentos"</string>
<string name="downloads_shortcut_label" msgid="9109062409874698197">"Descargas"</string>
+ <string name="archive_loading_failed" msgid="7243436722828766996">"No se puede abrir el archivo para explorarlo porque está dañado o su formato es incompatible."</string>
</resources>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index 1a6d262..b6d4dc4 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -146,4 +146,6 @@
</plurals>
<string name="documents_shortcut_label" msgid="6185476684846785830">"Dokumendid"</string>
<string name="downloads_shortcut_label" msgid="9109062409874698197">"Allalaadimised"</string>
+ <!-- no translation found for archive_loading_failed (7243436722828766996) -->
+ <skip />
</resources>
diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml
index 6d1d698..51a09cf 100644
--- a/res/values-eu-rES/strings.xml
+++ b/res/values-eu-rES/strings.xml
@@ -146,4 +146,6 @@
</plurals>
<string name="documents_shortcut_label" msgid="6185476684846785830">"Dokumentuak"</string>
<string name="downloads_shortcut_label" msgid="9109062409874698197">"Deskargak"</string>
+ <!-- no translation found for archive_loading_failed (7243436722828766996) -->
+ <skip />
</resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 55dfb09..91da4b1 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -146,4 +146,6 @@
</plurals>
<string name="documents_shortcut_label" msgid="6185476684846785830">"اسناد"</string>
<string name="downloads_shortcut_label" msgid="9109062409874698197">"بارگیریها"</string>
+ <!-- no translation found for archive_loading_failed (7243436722828766996) -->
+ <skip />
</resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index b629249..b9aef37 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -146,4 +146,5 @@
</plurals>
<string name="documents_shortcut_label" msgid="6185476684846785830">"Dokumentit"</string>
<string name="downloads_shortcut_label" msgid="9109062409874698197">"Lataukset"</string>
+ <string name="archive_loading_failed" msgid="7243436722828766996">"Arkistoa ei voi selata. Tiedosto on vioittunut tai sen muotoa ei tueta."</string>
</resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 0663f47..c33f0e6 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -146,4 +146,6 @@
</plurals>
<string name="documents_shortcut_label" msgid="6185476684846785830">"Documents"</string>
<string name="downloads_shortcut_label" msgid="9109062409874698197">"Téléchargements"</string>
+ <!-- no translation found for archive_loading_failed (7243436722828766996) -->
+ <skip />
</resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 2736bac..0498503 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -146,4 +146,6 @@
</plurals>
<string name="documents_shortcut_label" msgid="6185476684846785830">"Documents"</string>
<string name="downloads_shortcut_label" msgid="9109062409874698197">"Téléchargements"</string>
+ <!-- no translation found for archive_loading_failed (7243436722828766996) -->
+ <skip />
</resources>
diff --git a/res/values-gl-rES/strings.xml b/res/values-gl-rES/strings.xml
index 09b3ffb..aac5735 100644
--- a/res/values-gl-rES/strings.xml
+++ b/res/values-gl-rES/strings.xml
@@ -146,4 +146,6 @@
</plurals>
<string name="documents_shortcut_label" msgid="6185476684846785830">"Documentos"</string>
<string name="downloads_shortcut_label" msgid="9109062409874698197">"Descargas"</string>
+ <!-- no translation found for archive_loading_failed (7243436722828766996) -->
+ <skip />
</resources>
diff --git a/res/values-gu-rIN/strings.xml b/res/values-gu-rIN/strings.xml
index 0d1f12d..f7aef21 100644
--- a/res/values-gu-rIN/strings.xml
+++ b/res/values-gu-rIN/strings.xml
@@ -146,4 +146,6 @@
</plurals>
<string name="documents_shortcut_label" msgid="6185476684846785830">"દસ્તાવેજો"</string>
<string name="downloads_shortcut_label" msgid="9109062409874698197">"ડાઉનલોડ્સ"</string>
+ <!-- no translation found for archive_loading_failed (7243436722828766996) -->
+ <skip />
</resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 8b567d5..7e0b3bf 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -146,4 +146,6 @@
</plurals>
<string name="documents_shortcut_label" msgid="6185476684846785830">"दस्तावेज़"</string>
<string name="downloads_shortcut_label" msgid="9109062409874698197">"डाउनलोड"</string>
+ <!-- no translation found for archive_loading_failed (7243436722828766996) -->
+ <skip />
</resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 38bce6d..5f38f02 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -158,4 +158,6 @@
</plurals>
<string name="documents_shortcut_label" msgid="6185476684846785830">"Dokumenti"</string>
<string name="downloads_shortcut_label" msgid="9109062409874698197">"Preuzimanja"</string>
+ <!-- no translation found for archive_loading_failed (7243436722828766996) -->
+ <skip />
</resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index a2b5cc9..e1b0360 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -146,4 +146,6 @@
</plurals>
<string name="documents_shortcut_label" msgid="6185476684846785830">"Dokumentumok"</string>
<string name="downloads_shortcut_label" msgid="9109062409874698197">"Letöltések"</string>
+ <!-- no translation found for archive_loading_failed (7243436722828766996) -->
+ <skip />
</resources>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index 5f47bee..886d6db 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -146,4 +146,6 @@
</plurals>
<string name="documents_shortcut_label" msgid="6185476684846785830">"Փաստաթղթեր"</string>
<string name="downloads_shortcut_label" msgid="9109062409874698197">"Ներբեռնումներ"</string>
+ <!-- no translation found for archive_loading_failed (7243436722828766996) -->
+ <skip />
</resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 0e53dcc..7405d46 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -146,4 +146,5 @@
</plurals>
<string name="documents_shortcut_label" msgid="6185476684846785830">"Dokumen"</string>
<string name="downloads_shortcut_label" msgid="9109062409874698197">"Downloadan"</string>
+ <string name="archive_loading_failed" msgid="7243436722828766996">"Tidak dapat membuka arsip untuk dimuat. File rusak atau formatnya tidak didukung."</string>
</resources>
diff --git a/res/values-is-rIS/strings.xml b/res/values-is-rIS/strings.xml
index f74082a..e23eead 100644
--- a/res/values-is-rIS/strings.xml
+++ b/res/values-is-rIS/strings.xml
@@ -146,4 +146,6 @@
</plurals>
<string name="documents_shortcut_label" msgid="6185476684846785830">"Skjöl"</string>
<string name="downloads_shortcut_label" msgid="9109062409874698197">"Niðurhal"</string>
+ <!-- no translation found for archive_loading_failed (7243436722828766996) -->
+ <skip />
</resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 5d94896..8efc364 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -146,4 +146,5 @@
</plurals>
<string name="documents_shortcut_label" msgid="6185476684846785830">"Documenti"</string>
<string name="downloads_shortcut_label" msgid="9109062409874698197">"Download"</string>
+ <string name="archive_loading_failed" msgid="7243436722828766996">"Impossibile aprire il file di archivio per la navigazione. Il file è corrotto o in un formato non supportato."</string>
</resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 8c994f8..f05370b 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -170,4 +170,6 @@
</plurals>
<string name="documents_shortcut_label" msgid="6185476684846785830">"מסמכים"</string>
<string name="downloads_shortcut_label" msgid="9109062409874698197">"הורדות"</string>
+ <!-- no translation found for archive_loading_failed (7243436722828766996) -->
+ <skip />
</resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index fd7d39d..d997572 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -146,4 +146,6 @@
</plurals>
<string name="documents_shortcut_label" msgid="6185476684846785830">"ドキュメント"</string>
<string name="downloads_shortcut_label" msgid="9109062409874698197">"ダウンロード"</string>
+ <!-- no translation found for archive_loading_failed (7243436722828766996) -->
+ <skip />
</resources>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index 03cce39..b147ae0 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -146,4 +146,6 @@
</plurals>
<string name="documents_shortcut_label" msgid="6185476684846785830">"დოკუმენტები"</string>
<string name="downloads_shortcut_label" msgid="9109062409874698197">"ჩამოტვირთვები"</string>
+ <!-- no translation found for archive_loading_failed (7243436722828766996) -->
+ <skip />
</resources>
diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml
index 2d734f4..5b1f440 100644
--- a/res/values-kk-rKZ/strings.xml
+++ b/res/values-kk-rKZ/strings.xml
@@ -146,4 +146,5 @@
</plurals>
<string name="documents_shortcut_label" msgid="6185476684846785830">"Құжаттар"</string>
<string name="downloads_shortcut_label" msgid="9109062409874698197">"Жүктеп алынғандар"</string>
+ <string name="archive_loading_failed" msgid="7243436722828766996">"Мұрағат жүктелмеді. Файл бүлінген немесе форматына қолдау көрсетілмейді."</string>
</resources>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index fb359de..d2c76d1 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -146,4 +146,5 @@
</plurals>
<string name="documents_shortcut_label" msgid="6185476684846785830">"ឯកសារ"</string>
<string name="downloads_shortcut_label" msgid="9109062409874698197">"ទាញយក"</string>
+ <string name="archive_loading_failed" msgid="7243436722828766996">"មិនអាចបើកប័ណ្ណសារសម្រាប់ការរុករកបានទេ ដោយសារឯកសារខូច ឬមិនស្គាល់ទម្រង់ឯកសារ។"</string>
</resources>
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index 8a61fb2..02887c9 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml
@@ -146,4 +146,6 @@
</plurals>
<string name="documents_shortcut_label" msgid="6185476684846785830">"ಡಾಕ್ಯುಮೆಂಟ್ಗಳು"</string>
<string name="downloads_shortcut_label" msgid="9109062409874698197">"ಡೌನ್ಲೋಡ್ಗಳು"</string>
+ <!-- no translation found for archive_loading_failed (7243436722828766996) -->
+ <skip />
</resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 6bd3d20..8aff0d3 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -146,4 +146,6 @@
</plurals>
<string name="documents_shortcut_label" msgid="6185476684846785830">"문서"</string>
<string name="downloads_shortcut_label" msgid="9109062409874698197">"다운로드"</string>
+ <!-- no translation found for archive_loading_failed (7243436722828766996) -->
+ <skip />
</resources>
diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky-rKG/strings.xml
index 90044be..33a5961 100644
--- a/res/values-ky-rKG/strings.xml
+++ b/res/values-ky-rKG/strings.xml
@@ -146,4 +146,6 @@
</plurals>
<string name="documents_shortcut_label" msgid="6185476684846785830">"Документтер"</string>
<string name="downloads_shortcut_label" msgid="9109062409874698197">"Жүктөлүп алынгандар"</string>
+ <!-- no translation found for archive_loading_failed (7243436722828766996) -->
+ <skip />
</resources>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index 4e9f56a..68800e5 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -146,4 +146,6 @@
</plurals>
<string name="documents_shortcut_label" msgid="6185476684846785830">"ເອກະສານ"</string>
<string name="downloads_shortcut_label" msgid="9109062409874698197">"ດາວໂຫລດ"</string>
+ <!-- no translation found for archive_loading_failed (7243436722828766996) -->
+ <skip />
</resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 4962331..382c736 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -170,4 +170,6 @@
</plurals>
<string name="documents_shortcut_label" msgid="6185476684846785830">"Dokumentai"</string>
<string name="downloads_shortcut_label" msgid="9109062409874698197">"Atsisiuntimai"</string>
+ <!-- no translation found for archive_loading_failed (7243436722828766996) -->
+ <skip />
</resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 5abb982..e557f5c 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -158,4 +158,6 @@
</plurals>
<string name="documents_shortcut_label" msgid="6185476684846785830">"Dokumenti"</string>
<string name="downloads_shortcut_label" msgid="9109062409874698197">"Lejupielādes"</string>
+ <!-- no translation found for archive_loading_failed (7243436722828766996) -->
+ <skip />
</resources>
diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk-rMK/strings.xml
index 7258396..ad7696c 100644
--- a/res/values-mk-rMK/strings.xml
+++ b/res/values-mk-rMK/strings.xml
@@ -146,4 +146,5 @@
</plurals>
<string name="documents_shortcut_label" msgid="6185476684846785830">"Документи"</string>
<string name="downloads_shortcut_label" msgid="9109062409874698197">"Преземања"</string>
+ <string name="archive_loading_failed" msgid="7243436722828766996">"Не може да се отвори архивата за прелистување. Датотека или е оштетена или е со неподдржан формат."</string>
</resources>
diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml
index 176e3ce..7d9cd2c 100644
--- a/res/values-ml-rIN/strings.xml
+++ b/res/values-ml-rIN/strings.xml
@@ -146,4 +146,6 @@
</plurals>
<string name="documents_shortcut_label" msgid="6185476684846785830">"ഡോക്യുമെന്റുകൾ"</string>
<string name="downloads_shortcut_label" msgid="9109062409874698197">"ഡൗണ്ലോഡുകൾ"</string>
+ <!-- no translation found for archive_loading_failed (7243436722828766996) -->
+ <skip />
</resources>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index 4f99831..ec0666c 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -146,4 +146,5 @@
</plurals>
<string name="documents_shortcut_label" msgid="6185476684846785830">"Документ"</string>
<string name="downloads_shortcut_label" msgid="9109062409874698197">"Таталт"</string>
+ <string name="archive_loading_failed" msgid="7243436722828766996">"Хөтчид архив нээх боломжгүй байна. Муудсан, эсвэл дэмжээгүй форматын файл байна."</string>
</resources>
diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr-rIN/strings.xml
index 9a1bed7..da5101e 100644
--- a/res/values-mr-rIN/strings.xml
+++ b/res/values-mr-rIN/strings.xml
@@ -146,4 +146,6 @@
</plurals>
<string name="documents_shortcut_label" msgid="6185476684846785830">"दस्तऐवज"</string>
<string name="downloads_shortcut_label" msgid="9109062409874698197">"डाउनलोड"</string>
+ <!-- no translation found for archive_loading_failed (7243436722828766996) -->
+ <skip />
</resources>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index e655b37..7149f5c 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -146,4 +146,6 @@
</plurals>
<string name="documents_shortcut_label" msgid="6185476684846785830">"Dokumen"</string>
<string name="downloads_shortcut_label" msgid="9109062409874698197">"Muat turun"</string>
+ <!-- no translation found for archive_loading_failed (7243436722828766996) -->
+ <skip />
</resources>
diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml
index 1bb3a18..1aa7e86 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my-rMM/strings.xml
@@ -146,4 +146,5 @@
</plurals>
<string name="documents_shortcut_label" msgid="6185476684846785830">"မှတ်တမ်းမှတ်ရာများ"</string>
<string name="downloads_shortcut_label" msgid="9109062409874698197">"ဒေါင်းလုဒ်များ"</string>
+ <string name="archive_loading_failed" msgid="7243436722828766996">"မှတ်တမ်းဟောင်းကို ကြည့်ရှုရန်အတွက် ဖွင့်၍မရပါ။ ဖိုင်ပျက်စီးနေခြင်း သို့မဟုတ် ပံ့ပိုးမထားသည့် ပုံစံတွင်ရှိနေခြင်းတို့ ဖြစ်နိုင်သည်။"</string>
</resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index ef75b52..aee55fb 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -146,4 +146,6 @@
</plurals>
<string name="documents_shortcut_label" msgid="6185476684846785830">"Dokumenter"</string>
<string name="downloads_shortcut_label" msgid="9109062409874698197">"Nedlastinger"</string>
+ <!-- no translation found for archive_loading_failed (7243436722828766996) -->
+ <skip />
</resources>
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml
index 99ec111..15af624 100644
--- a/res/values-ne-rNP/strings.xml
+++ b/res/values-ne-rNP/strings.xml
@@ -146,4 +146,5 @@
</plurals>
<string name="documents_shortcut_label" msgid="6185476684846785830">"कागजातहरू"</string>
<string name="downloads_shortcut_label" msgid="9109062409874698197">"डाउनलोडहरू"</string>
+ <string name="archive_loading_failed" msgid="7243436722828766996">"ब्राउजिङको अभिलेख खोल्न सकिएन। फाइल या त बिग्रेको छ वा कुनै समर्थन नगरिने ढाँचामा छ।"</string>
</resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 8983dea..1dd7cfd 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -146,4 +146,5 @@
</plurals>
<string name="documents_shortcut_label" msgid="6185476684846785830">"Documenten"</string>
<string name="downloads_shortcut_label" msgid="9109062409874698197">"Downloads"</string>
+ <string name="archive_loading_failed" msgid="7243436722828766996">"Archief kan niet worden geopend voor browsen. Het bestand is mogelijk beschadigd of heeft een niet-ondersteunde indeling."</string>
</resources>
diff --git a/res/values-pa-rIN/strings.xml b/res/values-pa-rIN/strings.xml
index b961bd2..388bd9c 100644
--- a/res/values-pa-rIN/strings.xml
+++ b/res/values-pa-rIN/strings.xml
@@ -146,4 +146,6 @@
</plurals>
<string name="documents_shortcut_label" msgid="6185476684846785830">"ਦਸਤਾਵੇਜ਼"</string>
<string name="downloads_shortcut_label" msgid="9109062409874698197">"ਡਾਊਨਲੋਡ"</string>
+ <!-- no translation found for archive_loading_failed (7243436722828766996) -->
+ <skip />
</resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 2e5d857..8ead07f 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -170,4 +170,6 @@
</plurals>
<string name="documents_shortcut_label" msgid="6185476684846785830">"Dokumenty"</string>
<string name="downloads_shortcut_label" msgid="9109062409874698197">"Pobrane"</string>
+ <!-- no translation found for archive_loading_failed (7243436722828766996) -->
+ <skip />
</resources>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index ca8526e..2107ff3 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -146,4 +146,6 @@
</plurals>
<string name="documents_shortcut_label" msgid="6185476684846785830">"Documentos"</string>
<string name="downloads_shortcut_label" msgid="9109062409874698197">"Downloads"</string>
+ <!-- no translation found for archive_loading_failed (7243436722828766996) -->
+ <skip />
</resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index f60205e..2e16068 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -146,4 +146,6 @@
</plurals>
<string name="documents_shortcut_label" msgid="6185476684846785830">"Documentos"</string>
<string name="downloads_shortcut_label" msgid="9109062409874698197">"Transferências"</string>
+ <!-- no translation found for archive_loading_failed (7243436722828766996) -->
+ <skip />
</resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index ca8526e..2107ff3 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -146,4 +146,6 @@
</plurals>
<string name="documents_shortcut_label" msgid="6185476684846785830">"Documentos"</string>
<string name="downloads_shortcut_label" msgid="9109062409874698197">"Downloads"</string>
+ <!-- no translation found for archive_loading_failed (7243436722828766996) -->
+ <skip />
</resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 7c0ec54..1724851 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -158,4 +158,5 @@
</plurals>
<string name="documents_shortcut_label" msgid="6185476684846785830">"Documente"</string>
<string name="downloads_shortcut_label" msgid="9109062409874698197">"Descărcări"</string>
+ <string name="archive_loading_failed" msgid="7243436722828766996">"Nu se poate deschide arhiva pentru răsfoire. Fișierul ori este corupt, ori are un format neacceptat."</string>
</resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 117e2e6..c04509c 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -170,4 +170,6 @@
</plurals>
<string name="documents_shortcut_label" msgid="6185476684846785830">"Документы"</string>
<string name="downloads_shortcut_label" msgid="9109062409874698197">"Скачанные файлы"</string>
+ <!-- no translation found for archive_loading_failed (7243436722828766996) -->
+ <skip />
</resources>
diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml
index 73f084a..b075212 100644
--- a/res/values-si-rLK/strings.xml
+++ b/res/values-si-rLK/strings.xml
@@ -146,4 +146,5 @@
</plurals>
<string name="documents_shortcut_label" msgid="6185476684846785830">"ලේඛන"</string>
<string name="downloads_shortcut_label" msgid="9109062409874698197">"බාගැනීම්"</string>
+ <string name="archive_loading_failed" msgid="7243436722828766996">"බ්රවුස් කිරීම සඳහා සංරක්ෂිතය විවෘත කිරීමට නොහැකිය. ගොනුව දූෂිතය, නැතහොත් සහාය නොදක්වන ආකෘතියකි."</string>
</resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index fd50687..83d8eb4 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -170,4 +170,5 @@
</plurals>
<string name="documents_shortcut_label" msgid="6185476684846785830">"Dokumenty"</string>
<string name="downloads_shortcut_label" msgid="9109062409874698197">"Stiahnuté súbory"</string>
+ <string name="archive_loading_failed" msgid="7243436722828766996">"Archív nie je možné otvoriť a prehliadať. Súbor je buď poškodený, alebo jeho formát nie je podporovaný."</string>
</resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 0ed482d..b147fc8 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -170,4 +170,6 @@
</plurals>
<string name="documents_shortcut_label" msgid="6185476684846785830">"Dokumenti"</string>
<string name="downloads_shortcut_label" msgid="9109062409874698197">"Prenosi"</string>
+ <!-- no translation found for archive_loading_failed (7243436722828766996) -->
+ <skip />
</resources>
diff --git a/res/values-sq-rAL/strings.xml b/res/values-sq-rAL/strings.xml
index da5320b..9529f97 100644
--- a/res/values-sq-rAL/strings.xml
+++ b/res/values-sq-rAL/strings.xml
@@ -146,4 +146,5 @@
</plurals>
<string name="documents_shortcut_label" msgid="6185476684846785830">"Dokumentet"</string>
<string name="downloads_shortcut_label" msgid="9109062409874698197">"Shkarkimet"</string>
+ <string name="archive_loading_failed" msgid="7243436722828766996">"Arkivi nuk mund të hapet për të shfletuar. Skedari është i dëmtuar ose në një format që nuk mbështetet."</string>
</resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 4831832..84c727b 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -125,7 +125,7 @@
<string name="notification_copy_files_converted_title" msgid="6916768494891833365">"Неке датотеке су конвертоване"</string>
<string name="open_external_dialog_request" msgid="8173558471322861268">"Желите ли да дозволите апликацији <xliff:g id="APPNAME"><b>^1</b></xliff:g> да приступа директоријуму <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> на меморијском простору <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string>
<string name="open_external_dialog_request_primary_volume" msgid="2240992164087948176">"Желите ли да дозволите апликацији <xliff:g id="APPNAME"><b>^1</b></xliff:g> да приступа директоријуму <xliff:g id="DIRECTORY"><i>^2</i></xliff:g>?"</string>
- <string name="open_external_dialog_root_request" msgid="6776729293982633">"Желите ли да дозволите апликацији <xliff:g id="APPNAME"><b>^1</b></xliff:g> да приступа подацима, укључујући слике и видео снимке, на меморијском простору <xliff:g id="STORAGE"><i>^2</i></xliff:g>?"</string>
+ <string name="open_external_dialog_root_request" msgid="6776729293982633">"Желите ли да дозволите апликацији <xliff:g id="APPNAME"><b>^1</b></xliff:g> да приступа подацима, укључујући слике и видео, на меморијском простору <xliff:g id="STORAGE"><i>^2</i></xliff:g>?"</string>
<string name="never_ask_again" msgid="525908236522201138">"Не питај поново"</string>
<string name="allow" msgid="1275746941353040309">"Дозволи"</string>
<string name="deny" msgid="5127201668078153379">"Одбиј"</string>
@@ -158,4 +158,6 @@
</plurals>
<string name="documents_shortcut_label" msgid="6185476684846785830">"Документи"</string>
<string name="downloads_shortcut_label" msgid="9109062409874698197">"Преузимања"</string>
+ <!-- no translation found for archive_loading_failed (7243436722828766996) -->
+ <skip />
</resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index e77fc82..4d0f009 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -146,4 +146,6 @@
</plurals>
<string name="documents_shortcut_label" msgid="6185476684846785830">"Dokument"</string>
<string name="downloads_shortcut_label" msgid="9109062409874698197">"Nedladdningar"</string>
+ <!-- no translation found for archive_loading_failed (7243436722828766996) -->
+ <skip />
</resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index e7510db..3c51d37 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -146,4 +146,6 @@
</plurals>
<string name="documents_shortcut_label" msgid="6185476684846785830">"Hati"</string>
<string name="downloads_shortcut_label" msgid="9109062409874698197">"Vipakuliwa"</string>
+ <!-- no translation found for archive_loading_failed (7243436722828766996) -->
+ <skip />
</resources>
diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml
index b5895b5..6986e43 100644
--- a/res/values-ta-rIN/strings.xml
+++ b/res/values-ta-rIN/strings.xml
@@ -146,4 +146,6 @@
</plurals>
<string name="documents_shortcut_label" msgid="6185476684846785830">"ஆவணங்கள்"</string>
<string name="downloads_shortcut_label" msgid="9109062409874698197">"பதிவிறக்கங்கள்"</string>
+ <!-- no translation found for archive_loading_failed (7243436722828766996) -->
+ <skip />
</resources>
diff --git a/res/values-te-rIN/strings.xml b/res/values-te-rIN/strings.xml
index d54b16c..16f19f6 100644
--- a/res/values-te-rIN/strings.xml
+++ b/res/values-te-rIN/strings.xml
@@ -146,4 +146,6 @@
</plurals>
<string name="documents_shortcut_label" msgid="6185476684846785830">"పత్రాలు"</string>
<string name="downloads_shortcut_label" msgid="9109062409874698197">"డౌన్లోడ్లు"</string>
+ <!-- no translation found for archive_loading_failed (7243436722828766996) -->
+ <skip />
</resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index b8ed6d0..a33abe0 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -146,4 +146,6 @@
</plurals>
<string name="documents_shortcut_label" msgid="6185476684846785830">"เอกสาร"</string>
<string name="downloads_shortcut_label" msgid="9109062409874698197">"ดาวน์โหลด"</string>
+ <!-- no translation found for archive_loading_failed (7243436722828766996) -->
+ <skip />
</resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 0e00639..bfd4891 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -146,4 +146,6 @@
</plurals>
<string name="documents_shortcut_label" msgid="6185476684846785830">"Mga Dokumento"</string>
<string name="downloads_shortcut_label" msgid="9109062409874698197">"Mga Download"</string>
+ <!-- no translation found for archive_loading_failed (7243436722828766996) -->
+ <skip />
</resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 82cc6c5..e7702be 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -146,4 +146,6 @@
</plurals>
<string name="documents_shortcut_label" msgid="6185476684846785830">"Dokümanlar"</string>
<string name="downloads_shortcut_label" msgid="9109062409874698197">"İndirilenler"</string>
+ <!-- no translation found for archive_loading_failed (7243436722828766996) -->
+ <skip />
</resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index bfa55f6..1de4be1 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -170,4 +170,6 @@
</plurals>
<string name="documents_shortcut_label" msgid="6185476684846785830">"Документи"</string>
<string name="downloads_shortcut_label" msgid="9109062409874698197">"Завантаження"</string>
+ <!-- no translation found for archive_loading_failed (7243436722828766996) -->
+ <skip />
</resources>
diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur-rPK/strings.xml
index f108ab1..45dbc49 100644
--- a/res/values-ur-rPK/strings.xml
+++ b/res/values-ur-rPK/strings.xml
@@ -146,4 +146,6 @@
</plurals>
<string name="documents_shortcut_label" msgid="6185476684846785830">"دستاویزات"</string>
<string name="downloads_shortcut_label" msgid="9109062409874698197">"ڈاؤن لوڈز"</string>
+ <!-- no translation found for archive_loading_failed (7243436722828766996) -->
+ <skip />
</resources>
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml
index 2a3fc4d..bc488cc 100644
--- a/res/values-uz-rUZ/strings.xml
+++ b/res/values-uz-rUZ/strings.xml
@@ -146,4 +146,6 @@
</plurals>
<string name="documents_shortcut_label" msgid="6185476684846785830">"Hujjatlar"</string>
<string name="downloads_shortcut_label" msgid="9109062409874698197">"Yuklanmalar"</string>
+ <!-- no translation found for archive_loading_failed (7243436722828766996) -->
+ <skip />
</resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 8bf8e9a..3e37ecf 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -146,4 +146,5 @@
</plurals>
<string name="documents_shortcut_label" msgid="6185476684846785830">"Tài liệu"</string>
<string name="downloads_shortcut_label" msgid="9109062409874698197">"Nội dung tải xuống"</string>
+ <string name="archive_loading_failed" msgid="7243436722828766996">"Không thể mở lưu trữ để duyệt qua. Tệp bị hỏng hoặc có định dạng không được hỗ trợ."</string>
</resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index a61fc9c..f6bc379 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -146,4 +146,6 @@
</plurals>
<string name="documents_shortcut_label" msgid="6185476684846785830">"文档"</string>
<string name="downloads_shortcut_label" msgid="9109062409874698197">"下载内容"</string>
+ <!-- no translation found for archive_loading_failed (7243436722828766996) -->
+ <skip />
</resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 0299d6d..7dda318 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -146,4 +146,6 @@
</plurals>
<string name="documents_shortcut_label" msgid="6185476684846785830">"文件"</string>
<string name="downloads_shortcut_label" msgid="9109062409874698197">"下載"</string>
+ <!-- no translation found for archive_loading_failed (7243436722828766996) -->
+ <skip />
</resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index ea492fc..98cef62 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -146,4 +146,6 @@
</plurals>
<string name="documents_shortcut_label" msgid="6185476684846785830">"文件"</string>
<string name="downloads_shortcut_label" msgid="9109062409874698197">"下載"</string>
+ <!-- no translation found for archive_loading_failed (7243436722828766996) -->
+ <skip />
</resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index b9e8fb6..c051193 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -146,4 +146,5 @@
</plurals>
<string name="documents_shortcut_label" msgid="6185476684846785830">"Amadokhumenti"</string>
<string name="downloads_shortcut_label" msgid="9109062409874698197">"Okulandiwe"</string>
+ <string name="archive_loading_failed" msgid="7243436722828766996">"Ayikwazi ukuvula ukufaka kungobo yomlando yokuphequlula. Ifayela kungenzeka lonakele, noma ifomethi engasekelwa."</string>
</resources>
diff --git a/src/com/android/documentsui/BaseActivity.java b/src/com/android/documentsui/BaseActivity.java
index c9db7cc..1b121b4 100644
--- a/src/com/android/documentsui/BaseActivity.java
+++ b/src/com/android/documentsui/BaseActivity.java
@@ -46,13 +46,13 @@
import com.android.documentsui.Injector.Injected;
import com.android.documentsui.NavigationViewManager.Breadcrumb;
import com.android.documentsui.base.DocumentInfo;
-import com.android.documentsui.base.LocalPreferences;
import com.android.documentsui.base.RootInfo;
import com.android.documentsui.base.Shared;
import com.android.documentsui.base.State;
import com.android.documentsui.base.State.ViewMode;
import com.android.documentsui.dirlist.AnimationView;
import com.android.documentsui.dirlist.DirectoryFragment;
+import com.android.documentsui.prefs.LocalPreferences;
import com.android.documentsui.queries.DebugCommandProcessor;
import com.android.documentsui.queries.SearchViewManager;
import com.android.documentsui.queries.SearchViewManager.SearchManagerListener;
diff --git a/src/com/android/documentsui/FocusManager.java b/src/com/android/documentsui/FocusManager.java
index 1b8567e..85f7f74 100644
--- a/src/com/android/documentsui/FocusManager.java
+++ b/src/com/android/documentsui/FocusManager.java
@@ -84,7 +84,7 @@
boolean focusChanged = false;
if (mNavDrawerHasFocus) {
mDrawer.setOpen(false);
- focusDirectoryList();
+ focusChanged = focusDirectoryList();
} else {
mDrawer.setOpen(true);
focusChanged = mRootsFocuser.run();
diff --git a/src/com/android/documentsui/Injector.java b/src/com/android/documentsui/Injector.java
index 4c767ae..81a7773 100644
--- a/src/com/android/documentsui/Injector.java
+++ b/src/com/android/documentsui/Injector.java
@@ -25,9 +25,9 @@
import com.android.documentsui.MenuManager.SelectionDetails;
import com.android.documentsui.base.EventHandler;
-import com.android.documentsui.base.ScopedPreferences;
import com.android.documentsui.dirlist.DocumentsAdapter;
import com.android.documentsui.dirlist.Model;
+import com.android.documentsui.prefs.ScopedPreferences;
import com.android.documentsui.selection.SelectionManager;
import com.android.documentsui.selection.SelectionManager.SelectionPredicate;
import com.android.documentsui.ui.DialogController;
diff --git a/src/com/android/documentsui/OpenExternalDirectoryActivity.java b/src/com/android/documentsui/OpenExternalDirectoryActivity.java
index 44ccc1e..74af224 100644
--- a/src/com/android/documentsui/OpenExternalDirectoryActivity.java
+++ b/src/com/android/documentsui/OpenExternalDirectoryActivity.java
@@ -29,11 +29,11 @@
import static com.android.documentsui.Metrics.SCOPED_DIRECTORY_ACCESS_INVALID_DIRECTORY;
import static com.android.documentsui.Metrics.logInvalidScopedAccessRequest;
import static com.android.documentsui.Metrics.logValidScopedAccessRequest;
-import static com.android.documentsui.base.LocalPreferences.PERMISSION_ASK_AGAIN;
-import static com.android.documentsui.base.LocalPreferences.PERMISSION_NEVER_ASK;
-import static com.android.documentsui.base.LocalPreferences.getScopedAccessPermissionStatus;
-import static com.android.documentsui.base.LocalPreferences.setScopedAccessPermissionStatus;
import static com.android.documentsui.base.Shared.DEBUG;
+import static com.android.documentsui.prefs.LocalPreferences.PERMISSION_ASK_AGAIN;
+import static com.android.documentsui.prefs.LocalPreferences.PERMISSION_NEVER_ASK;
+import static com.android.documentsui.prefs.LocalPreferences.getScopedAccessPermissionStatus;
+import static com.android.documentsui.prefs.LocalPreferences.setScopedAccessPermissionStatus;
import android.annotation.SuppressLint;
import android.app.Activity;
diff --git a/src/com/android/documentsui/PackageReceiver.java b/src/com/android/documentsui/PackageReceiver.java
index 9c4ebf5..5cb2827 100644
--- a/src/com/android/documentsui/PackageReceiver.java
+++ b/src/com/android/documentsui/PackageReceiver.java
@@ -22,8 +22,8 @@
import android.content.Intent;
import android.net.Uri;
-import com.android.documentsui.base.LocalPreferences;
import com.android.documentsui.picker.LastAccessedProvider;
+import com.android.documentsui.prefs.LocalPreferences;
/**
* Clean up {@link LastAccessedProvider} and {@link LocalPreferences} when packages are removed.
diff --git a/src/com/android/documentsui/dirlist/DirectoryAddonsAdapter.java b/src/com/android/documentsui/dirlist/DirectoryAddonsAdapter.java
index d99e168..0437361 100644
--- a/src/com/android/documentsui/dirlist/DirectoryAddonsAdapter.java
+++ b/src/com/android/documentsui/dirlist/DirectoryAddonsAdapter.java
@@ -83,17 +83,25 @@
@Override
public DocumentHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+ DocumentHolder holder = null;
switch (viewType) {
case ITEM_TYPE_SECTION_BREAK:
- return new TransparentDividerDocumentHolder(mEnv.getContext());
+ holder = new TransparentDividerDocumentHolder(mEnv.getContext());
+ mEnv.initDocumentHolder(holder);
+ break;
case ITEM_TYPE_HEADER_MESSAGE:
- return new HeaderMessageDocumentHolder(mEnv.getContext(), parent,
+ holder = new HeaderMessageDocumentHolder(mEnv.getContext(), parent,
this::onDismissHeaderMessage);
+ mEnv.initDocumentHolder(holder);
+ break;
case ITEM_TYPE_INFLATED_MESSAGE:
- return new InflateMessageDocumentHolder(mEnv.getContext(), parent);
+ holder = new InflateMessageDocumentHolder(mEnv.getContext(), parent);
+ mEnv.initDocumentHolder(holder);
+ break;
default:
- return mDelegate.createViewHolder(parent, viewType);
+ holder = mDelegate.createViewHolder(parent, viewType);
}
+ return holder;
}
private void onDismissHeaderMessage() {
diff --git a/src/com/android/documentsui/dirlist/HeaderMessageDocumentHolder.java b/src/com/android/documentsui/dirlist/HeaderMessageDocumentHolder.java
index be2ce4c..8c8fbdc 100644
--- a/src/com/android/documentsui/dirlist/HeaderMessageDocumentHolder.java
+++ b/src/com/android/documentsui/dirlist/HeaderMessageDocumentHolder.java
@@ -31,7 +31,7 @@
* are more information from the Provider.
* Used by {@link DirectoryAddonsAdapter}.
*/
-final class HeaderMessageDocumentHolder extends DocumentHolder {
+final class HeaderMessageDocumentHolder extends MessageHolder {
private Message mMessage;
private ImageView mIcon;
private TextView mTextView;
diff --git a/src/com/android/documentsui/dirlist/InflateMessageDocumentHolder.java b/src/com/android/documentsui/dirlist/InflateMessageDocumentHolder.java
index d0c4ba0..d0709cb 100644
--- a/src/com/android/documentsui/dirlist/InflateMessageDocumentHolder.java
+++ b/src/com/android/documentsui/dirlist/InflateMessageDocumentHolder.java
@@ -29,7 +29,7 @@
* in the directory, whether due to no items, no search results or an error.
* Used by {@link DirectoryAddonsAdapter}.
*/
-final class InflateMessageDocumentHolder extends DocumentHolder {
+final class InflateMessageDocumentHolder extends MessageHolder {
private Message mMessage;
private TextView mMsgView;
private ImageView mImageView;
diff --git a/src/com/android/documentsui/dirlist/MessageHolder.java b/src/com/android/documentsui/dirlist/MessageHolder.java
new file mode 100644
index 0000000..a9a722d
--- /dev/null
+++ b/src/com/android/documentsui/dirlist/MessageHolder.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.documentsui.dirlist;
+
+import android.content.Context;
+import android.view.ViewGroup;
+import android.widget.Space;
+
+import com.android.documentsui.base.DocumentInfo;
+import com.android.documentsui.base.Events.InputEvent;
+
+/**
+ * Base class for all non-Document Holder classes.
+ */
+abstract class MessageHolder extends DocumentHolder {
+ public MessageHolder(Context context, Space space) {
+ super(context, space);
+ }
+
+ public MessageHolder(Context context, ViewGroup parent, int layout) {
+ super(context, parent, layout);
+ }
+
+ @Override
+ public boolean isInSelectionHotspot(InputEvent event) {
+ return false;
+ }
+
+ @Override
+ public boolean isInDragHotspot(InputEvent event) {
+ return false;
+ }
+}
\ No newline at end of file
diff --git a/src/com/android/documentsui/dirlist/Model.java b/src/com/android/documentsui/dirlist/Model.java
index 63dcb4b..d0128ef 100644
--- a/src/com/android/documentsui/dirlist/Model.java
+++ b/src/com/android/documentsui/dirlist/Model.java
@@ -20,6 +20,7 @@
import static com.android.documentsui.base.DocumentInfo.getCursorString;
import static com.android.documentsui.base.Shared.DEBUG;
import static com.android.documentsui.base.Shared.VERBOSE;
+import static com.android.documentsui.base.Shared.ENABLE_OMC_API_FEATURES;
import android.annotation.IntDef;
import android.database.Cursor;
@@ -54,11 +55,16 @@
public class Model {
/**
- * Filter that passes (returns true) all non-partial files and non-archived files.
+ * Filter that passes (returns true) for all files which can be shared.
*/
public static final Predicate<Cursor> SHARABLE_FILE_FILTER = (Cursor c) -> {
int flags = getCursorInt(c, Document.COLUMN_FLAGS);
String authority = getCursorString(c, RootCursorWrapper.COLUMN_AUTHORITY);
+ if (!ENABLE_OMC_API_FEATURES) {
+ return (flags & Document.FLAG_PARTIAL) == 0
+ && (flags & Document.FLAG_VIRTUAL_DOCUMENT) == 0
+ && !ArchivesProvider.AUTHORITY.equals(authority);
+ }
return (flags & Document.FLAG_PARTIAL) == 0
&& !ArchivesProvider.AUTHORITY.equals(authority);
};
diff --git a/src/com/android/documentsui/dirlist/TransparentDividerDocumentHolder.java b/src/com/android/documentsui/dirlist/TransparentDividerDocumentHolder.java
index 2cf8b3e..44efd80 100644
--- a/src/com/android/documentsui/dirlist/TransparentDividerDocumentHolder.java
+++ b/src/com/android/documentsui/dirlist/TransparentDividerDocumentHolder.java
@@ -16,6 +16,7 @@
package com.android.documentsui.dirlist;
+
import android.content.Context;
import android.database.Cursor;
import android.widget.Space;
@@ -27,7 +28,7 @@
* The most elegant transparent blank box that spans N rows ever conceived.
* Used by {@link DirectoryAddonsAdapter}.
*/
-final class TransparentDividerDocumentHolder extends DocumentHolder {
+final class TransparentDividerDocumentHolder extends MessageHolder {
private final int mVisibleHeight;
private State mState;
diff --git a/src/com/android/documentsui/dirlist/UserInputHandler.java b/src/com/android/documentsui/dirlist/UserInputHandler.java
index 00912cd..8da25cf 100644
--- a/src/com/android/documentsui/dirlist/UserInputHandler.java
+++ b/src/com/android/documentsui/dirlist/UserInputHandler.java
@@ -429,7 +429,7 @@
// TODO: Refactor FocusManager to depend only on DocumentDetails so we can eliminate
// difficult to test dependency on DocumentHolder.
- boolean onKey(DocumentHolder doc, int keyCode, KeyEvent event) {
+ boolean onKey(@Nullable DocumentHolder doc, int keyCode, KeyEvent event) {
// Only handle key-down events. This is simpler, consistent with most other UIs, and
// enables the handling of repeated key events from holding down a key.
if (event.getAction() != KeyEvent.ACTION_DOWN) {
@@ -441,6 +441,16 @@
return false;
}
+ // Ignore events sent to Addon Holders.
+ if (doc != null) {
+ int itemType = doc.getItemViewType();
+ if (itemType == DocumentsAdapter.ITEM_TYPE_HEADER_MESSAGE
+ || itemType == DocumentsAdapter.ITEM_TYPE_INFLATED_MESSAGE
+ || itemType == DocumentsAdapter.ITEM_TYPE_SECTION_BREAK) {
+ return false;
+ }
+ }
+
if (mFocusHandler.handleKey(doc, keyCode, event)) {
// Handle range selection adjustments. Extending the selection will adjust the
// bounds of the in-progress range selection. Each time an unshifted navigation
diff --git a/src/com/android/documentsui/files/ActionHandler.java b/src/com/android/documentsui/files/ActionHandler.java
index ff8f5a9..9bbba35 100644
--- a/src/com/android/documentsui/files/ActionHandler.java
+++ b/src/com/android/documentsui/files/ActionHandler.java
@@ -321,7 +321,8 @@
intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
intent.addCategory(Intent.CATEGORY_DEFAULT);
- if (mScope.model.hasDocuments(selection, Model.VIRTUAL_DOCUMENT_FILTER)) {
+ if (Shared.ENABLE_OMC_API_FEATURES
+ && mScope.model.hasDocuments(selection, Model.VIRTUAL_DOCUMENT_FILTER)) {
intent.addCategory(Intent.CATEGORY_TYPED_OPENABLE);
}
diff --git a/src/com/android/documentsui/files/FilesActivity.java b/src/com/android/documentsui/files/FilesActivity.java
index 85c140a..bbeb623 100644
--- a/src/com/android/documentsui/files/FilesActivity.java
+++ b/src/com/android/documentsui/files/FilesActivity.java
@@ -47,11 +47,11 @@
import com.android.documentsui.base.DocumentInfo;
import com.android.documentsui.base.DocumentStack;
import com.android.documentsui.base.RootInfo;
-import com.android.documentsui.base.ScopedPreferences;
import com.android.documentsui.base.Shared;
import com.android.documentsui.base.State;
import com.android.documentsui.clipping.DocumentClipper;
import com.android.documentsui.dirlist.AnimationView.AnimationType;
+import com.android.documentsui.prefs.ScopedPreferences;
import com.android.documentsui.dirlist.DirectoryFragment;
import com.android.documentsui.selection.SelectionManager;
import com.android.documentsui.services.FileOperationService;
diff --git a/src/com/android/documentsui/picker/PickActivity.java b/src/com/android/documentsui/picker/PickActivity.java
index b0b4ff4..8c5961f 100644
--- a/src/com/android/documentsui/picker/PickActivity.java
+++ b/src/com/android/documentsui/picker/PickActivity.java
@@ -56,11 +56,11 @@
import com.android.documentsui.base.MimeTypes;
import com.android.documentsui.base.PairedTask;
import com.android.documentsui.base.RootInfo;
-import com.android.documentsui.base.ScopedPreferences;
import com.android.documentsui.base.Shared;
import com.android.documentsui.base.State;
import com.android.documentsui.dirlist.DirectoryFragment;
import com.android.documentsui.picker.LastAccessedProvider.Columns;
+import com.android.documentsui.prefs.ScopedPreferences;
import com.android.documentsui.selection.SelectionManager;
import com.android.documentsui.services.FileOperationService;
import com.android.documentsui.sidebar.RootsFragment;
diff --git a/src/com/android/documentsui/base/LocalPreferences.java b/src/com/android/documentsui/prefs/LocalPreferences.java
similarity index 97%
rename from src/com/android/documentsui/base/LocalPreferences.java
rename to src/com/android/documentsui/prefs/LocalPreferences.java
index 0d1e639..1beaf5d 100644
--- a/src/com/android/documentsui/base/LocalPreferences.java
+++ b/src/com/android/documentsui/prefs/LocalPreferences.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.documentsui.base;
+package com.android.documentsui.prefs;
import static com.android.documentsui.base.State.MODE_UNKNOWN;
@@ -26,6 +26,8 @@
import android.os.UserHandle;
import android.preference.PreferenceManager;
+import com.android.documentsui.base.RootInfo;
+import com.android.documentsui.base.State;
import com.android.documentsui.base.State.ViewMode;
import java.lang.annotation.Retention;
diff --git a/src/com/android/documentsui/base/ScopedPreferences.java b/src/com/android/documentsui/prefs/ScopedPreferences.java
similarity index 98%
rename from src/com/android/documentsui/base/ScopedPreferences.java
rename to src/com/android/documentsui/prefs/ScopedPreferences.java
index 92cca49..c74753a 100644
--- a/src/com/android/documentsui/base/ScopedPreferences.java
+++ b/src/com/android/documentsui/prefs/ScopedPreferences.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.documentsui.base;
+package com.android.documentsui.prefs;
import android.content.Context;
import android.content.SharedPreferences;
diff --git a/tests/common/com/android/documentsui/bots/DirectoryListBot.java b/tests/common/com/android/documentsui/bots/DirectoryListBot.java
index 0207557..4e9542e 100644
--- a/tests/common/com/android/documentsui/bots/DirectoryListBot.java
+++ b/tests/common/com/android/documentsui/bots/DirectoryListBot.java
@@ -108,7 +108,7 @@
assertTrue(messageTextView.exists());
String msg = String.valueOf(message);
- assertEquals(String.format(msg, "TEST_ROOT_0"), messageTextView.getText());
+ assertEquals(msg, messageTextView.getText());
}
diff --git a/tests/functional/com/android/documentsui/FilesActivityDefaultsUiTest.java b/tests/functional/com/android/documentsui/FilesActivityDefaultsUiTest.java
index aaace3e..f16ac29 100644
--- a/tests/functional/com/android/documentsui/FilesActivityDefaultsUiTest.java
+++ b/tests/functional/com/android/documentsui/FilesActivityDefaultsUiTest.java
@@ -19,9 +19,9 @@
import static com.android.documentsui.StubProvider.ROOT_0_ID;
import static com.android.documentsui.StubProvider.ROOT_1_ID;
-import android.content.Intent;
-import android.provider.DocumentsContract;
+import android.os.RemoteException;
import android.support.test.filters.LargeTest;
+import android.support.v7.recyclerview.R;
import com.android.documentsui.base.RootInfo;
import com.android.documentsui.base.Shared;
@@ -35,6 +35,11 @@
}
@Override
+ protected void initTestFiles() throws RemoteException {
+ // Overriding to init with no items in test roots
+ }
+
+ @Override
protected RootInfo getInitialRoot() {
return null; // test the default, unaffected state of the app.
}
@@ -50,6 +55,18 @@
}
}
+ public void testNavigate_FromEmptyDirectory() throws Exception {
+ device.waitForIdle();
+
+ bots.roots.openRoot(rootDir0.title);
+
+ String msg = String.valueOf(context.getString(R.string.empty));
+ bots.directory.assertMessageTextView(msg);
+
+ // Check to make sure back button is properly handled by non-Doc type DocHolders
+ device.pressBack();
+ }
+
public void testDefaultRoots() throws Exception {
device.waitForIdle();