summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--res/values-as/strings.xml2
-rw-r--r--res/values-cs/strings.xml2
-rw-r--r--res/values-eu/strings.xml2
-rw-r--r--res/values-fr-rCA/strings.xml2
-rw-r--r--res/values-fr/strings.xml2
-rw-r--r--res/values-hi/strings.xml6
-rw-r--r--res/values-hy/strings.xml2
-rw-r--r--res/values-ko/strings.xml2
-rw-r--r--res/values-mn/strings.xml2
-rw-r--r--res/values-mr/strings.xml2
-rw-r--r--res/values-my/strings.xml2
-rw-r--r--res/values-pt-rBR/strings.xml2
-rw-r--r--res/values-pt-rPT/strings.xml2
-rw-r--r--res/values-pt/strings.xml2
-rw-r--r--res/values-uz/strings.xml4
-rw-r--r--res/values-zh-rCN/strings.xml14
-rw-r--r--src/com/android/documentsui/roots/ProvidersCache.java13
-rw-r--r--tests/common/com/android/documentsui/bots/UiBot.java2
-rw-r--r--tests/functional/com/android/documentsui/KeyboardNavigationUiTest.java1
-rw-r--r--tests/functional/com/android/documentsui/SearchViewUiTest.java2
20 files changed, 39 insertions, 29 deletions
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index 1cd3055f0..1d21c9a08 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -79,7 +79,7 @@
<string name="root_type_shortcut" msgid="6059343175525442279">"শ্বৰ্টকাটসমূহ"</string>
<string name="root_type_device" msgid="1713604128005476585">"ডিভাইচসমূহ"</string>
<string name="root_type_apps" msgid="8646073235029886342">"অধিক এপ্"</string>
- <string name="empty" msgid="5300254272613103004">"কোনো সমল নাই"</string>
+ <string name="empty" msgid="5300254272613103004">"কোনো বস্তু নাই"</string>
<string name="no_results" msgid="2371026325236359209">"%1$s ত কোনো মিল পোৱা নগ\'ল"</string>
<string name="toast_no_application" msgid="7555319548595113121">"ফাইল খুলিব পৰা নাই"</string>
<string name="toast_view_in_archives_unsupported" msgid="1923221390170964845">"আৰ্কাইভত থকা ফাইলবোৰ খুলিব নোৱাৰি"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index c715bad54..ac50d49a6 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -72,7 +72,7 @@
<string name="drawer_close" msgid="4263880768630848848">"Skrýt kořeny"</string>
<string name="save_error" msgid="8631128801982095782">"Uložení dokumentu se nezdařilo"</string>
<string name="create_error" msgid="3092144450044861994">"Složku se nepodařilo vytvořit"</string>
- <string name="query_error" msgid="6625421453613879336">"Obsah nyní nelze načíst"</string>
+ <string name="query_error" msgid="6625421453613879336">"Obsah teď nelze načíst"</string>
<string name="root_recent" msgid="1080156975424341623">"Nedávné"</string>
<string name="root_available_bytes" msgid="8269870862691408864">"Volný prostor: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
<string name="root_type_service" msgid="6521366147466512289">"Služby úložiště"</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index df69cf56c..37e0b675a 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -169,7 +169,7 @@
<string name="rename_error" msgid="6700093173508118635">"Ezin izan zaio aldatu izena dokumentuari"</string>
<string name="menu_eject_root" msgid="9215040039374893613">"Atera"</string>
<string name="notification_copy_files_converted_title" msgid="6916768494891833365">"Artxibo batzuk bihurtu dira"</string>
- <string name="open_external_dialog_request" msgid="8173558471322861268">"<xliff:g id="APPNAME"><b>^1</b></xliff:g> aplikazioari <xliff:g id="STORAGE"><i>^3</i></xliff:g> unitateko <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> direktorioa atzitzeko baimena eman nahi diozu?"</string>
+ <string name="open_external_dialog_request" msgid="8173558471322861268">"<xliff:g id="APPNAME"><b>^1</b></xliff:g> aplikazioari <xliff:g id="STORAGE"><i>^3</i></xliff:g> unitateko <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> direktoriorako sarbidea eman nahi diozu?"</string>
<string name="open_external_dialog_request_primary_volume" msgid="2240992164087948176">"<xliff:g id="APPNAME"><b>^1</b></xliff:g> aplikazioari <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> direktoriorako sarbidea eman nahi diozu?"</string>
<string name="open_external_dialog_root_request" msgid="6776729293982633">"<xliff:g id="APPNAME"><b>^1</b></xliff:g> aplikazioari zure datuak atzitzea baimendu nahi diozu, besteak beste, <xliff:g id="STORAGE"><i>^2</i></xliff:g> biltegian dituzun argazkiak eta bideoak?"</string>
<string name="never_ask_again" msgid="525908236522201138">"Ez galdetu berriro"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 35fe14dad..5181811cd 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -48,7 +48,7 @@
<string name="menu_copy_to_clipboard" msgid="5064081159073330776">"Copier"</string>
<string name="menu_paste_from_clipboard" msgid="360947260414135827">"Coller"</string>
<string name="menu_paste_into_folder" msgid="8000644546983240101">"Coller dans le dossier"</string>
- <string name="menu_advanced_show" msgid="7558626506462906726">"Aff. mém. stock. interne"</string>
+ <string name="menu_advanced_show" msgid="7558626506462906726">"Aff. mémoire stockage int."</string>
<string name="menu_advanced_hide" msgid="6488381508009246334">"Masquer mém. stock. int."</string>
<string name="button_select" msgid="240863497069321364">"Sélectionner"</string>
<string name="button_copy" msgid="8219059853840996027">"Copier"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index f1ff20d33..29bf594c5 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -48,7 +48,7 @@
<string name="menu_copy_to_clipboard" msgid="5064081159073330776">"Copier"</string>
<string name="menu_paste_from_clipboard" msgid="360947260414135827">"Coller"</string>
<string name="menu_paste_into_folder" msgid="8000644546983240101">"Coller dans le dossier"</string>
- <string name="menu_advanced_show" msgid="7558626506462906726">"Aff. mém. stock. interne"</string>
+ <string name="menu_advanced_show" msgid="7558626506462906726">"Aff. mémoire stockage interne"</string>
<string name="menu_advanced_hide" msgid="6488381508009246334">"Masquer mém. stock. int."</string>
<string name="button_select" msgid="240863497069321364">"Sélectionner"</string>
<string name="button_copy" msgid="8219059853840996027">"Copier"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 0d0a0995a..f40bce729 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -27,7 +27,7 @@
<string name="menu_create_dir" msgid="2413624798689091042">"नया फ़ोल्डर"</string>
<string name="menu_grid" msgid="1453636521731880680">"ग्रिड दृश्य"</string>
<string name="menu_list" msgid="6714267452146410402">"सूची दृश्य"</string>
- <string name="menu_search" msgid="1876699106790719849">"सर्च करें"</string>
+ <string name="menu_search" msgid="1876699106790719849">"खोजें"</string>
<string name="menu_settings" msgid="6520844520117939047">"जगह सेटिंग"</string>
<string name="menu_open" msgid="9092138100049759315">"खोलें"</string>
<string name="menu_open_with" msgid="5507647065467520229">"इसमें खोलें"</string>
@@ -64,7 +64,7 @@
<string name="sort_dimension_summary" msgid="7724534446881397860">"सारांश"</string>
<string name="sort_dimension_file_type" msgid="5779709622922085381">"प्रकार"</string>
<string name="sort_dimension_size" msgid="2190547351159472884">"आकार"</string>
- <string name="sort_dimension_date" msgid="4231005651895254033">"बदलनेे का समय"</string>
+ <string name="sort_dimension_date" msgid="4231005651895254033">"बदले जाने का समय"</string>
<string name="directory_items" msgid="6645621978998614003">"आइटम की संख्या"</string>
<string name="sort_direction_ascending" msgid="5882787683763248102">"बढ़ते क्रम में"</string>
<string name="sort_direction_descending" msgid="1729187589765894076">"घटते क्रम में"</string>
@@ -172,7 +172,7 @@
<string name="open_external_dialog_request" msgid="8173558471322861268">"<xliff:g id="APPNAME"><b>^1</b></xliff:g> को <xliff:g id="STORAGE"><i>^3</i></xliff:g> पर <xliff:g id="DIRECTORY"><i>^2</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="never_ask_again" msgid="525908236522201138">"फिर से ना पूछें"</string>
+ <string name="never_ask_again" msgid="525908236522201138">"फिर से न पूछें"</string>
<string name="allow" msgid="1275746941353040309">"अनुमति दें"</string>
<string name="deny" msgid="5127201668078153379">"अस्वीकार करें"</string>
<plurals name="elements_selected" formatted="false" msgid="4448165978637163692">
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 1ab4e9acf..b37eddaf2 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -161,7 +161,7 @@
<item quantity="other">Այս ֆայլը փոխարկվել են այլ ձևաչափի՝ <xliff:g id="LIST_1">%1$s</xliff:g></item>
</plurals>
<plurals name="clipboard_files_clipped" formatted="false" msgid="4847061634862926902">
- <item quantity="one">Copied <xliff:g id="COUNT_1">%1$d</xliff:g> items to clipboard.</item>
+ <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> տարր պատճենվեց սեղմատախտակին։</item>
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> տարր պատճենվեց սեղմատախտակին:</item>
</plurals>
<string name="file_operation_rejected" msgid="4301554203329008794">"Ֆայլի աշխատանքը չի աջակցվում:"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 7bda51683..4eb0d5148 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -73,7 +73,7 @@
<string name="save_error" msgid="8631128801982095782">"문서를 저장하지 못했습니다."</string>
<string name="create_error" msgid="3092144450044861994">"폴더를 만들지 못했습니다."</string>
<string name="query_error" msgid="6625421453613879336">"현재 콘텐츠를 로드할 수 없습니다."</string>
- <string name="root_recent" msgid="1080156975424341623">"최근순"</string>
+ <string name="root_recent" msgid="1080156975424341623">"최근"</string>
<string name="root_available_bytes" msgid="8269870862691408864">"<xliff:g id="SIZE">%1$s</xliff:g> 남음"</string>
<string name="root_type_service" msgid="6521366147466512289">"저장용량 서비스"</string>
<string name="root_type_shortcut" msgid="6059343175525442279">"바로가기"</string>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index 5b9e111e3..f407d552d 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -79,7 +79,7 @@
<string name="root_type_shortcut" msgid="6059343175525442279">"Товчлол"</string>
<string name="root_type_device" msgid="1713604128005476585">"Төхөөрөмж"</string>
<string name="root_type_apps" msgid="8646073235029886342">"Бусад апп"</string>
- <string name="empty" msgid="5300254272613103004">"Зүйл алга"</string>
+ <string name="empty" msgid="5300254272613103004">"Хоосон"</string>
<string name="no_results" msgid="2371026325236359209">"%1$s-д тохирох зүйл алга"</string>
<string name="toast_no_application" msgid="7555319548595113121">"Файлыг нээх боломжгүй байна"</string>
<string name="toast_view_in_archives_unsupported" msgid="1923221390170964845">"Архивын файлыг нээх боломжгүй"</string>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index bf32ed76a..a1d4011a4 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -70,7 +70,7 @@
<string name="sort_direction_descending" msgid="1729187589765894076">"उतरत्या क्रमाने"</string>
<string name="drawer_open" msgid="8071673398187261741">"रूट दर्शवा"</string>
<string name="drawer_close" msgid="4263880768630848848">"रूट लपवा"</string>
- <string name="save_error" msgid="8631128801982095782">"दस्तऐवज जतन करणे अयशस्वी झाले"</string>
+ <string name="save_error" msgid="8631128801982095782">"दस्तऐवज सेव्ह करणे अयशस्वी झाले"</string>
<string name="create_error" msgid="3092144450044861994">"फोल्डर तयार करण्यात अयशस्वी झाले"</string>
<string name="query_error" msgid="6625421453613879336">"याक्षणी सामग्री लोड करू शकत नाही"</string>
<string name="root_recent" msgid="1080156975424341623">"अलीकडील"</string>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 66dfb5045..0540d4fa3 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -79,7 +79,7 @@
<string name="root_type_shortcut" msgid="6059343175525442279">"အမြန်နည်းများ"</string>
<string name="root_type_device" msgid="1713604128005476585">"စက်ပစ္စည်းများ"</string>
<string name="root_type_apps" msgid="8646073235029886342">"နောက်ထပ်အက်ပ်များ"</string>
- <string name="empty" msgid="5300254272613103004">"ဘာမှ မရှိပါ"</string>
+ <string name="empty" msgid="5300254272613103004">"ဘာမျှ မရှိပါ"</string>
<string name="no_results" msgid="2371026325236359209">"%1$s တွင် ကိုက်ညီသည့်အရာ မရှိပါ"</string>
<string name="toast_no_application" msgid="7555319548595113121">"ဖိုင်ကို ဖွင့်၍မရပါ"</string>
<string name="toast_view_in_archives_unsupported" msgid="1923221390170964845">"မှတ်တမ်းဟောင်းထဲမှ ဖိုင်များကို ဖွင့်၍မရပါ"</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 4bec73520..b6b5738d4 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -64,7 +64,7 @@
<string name="sort_dimension_summary" msgid="7724534446881397860">"Resumo"</string>
<string name="sort_dimension_file_type" msgid="5779709622922085381">"Tipo"</string>
<string name="sort_dimension_size" msgid="2190547351159472884">"Tamanho"</string>
- <string name="sort_dimension_date" msgid="4231005651895254033">"Modificação"</string>
+ <string name="sort_dimension_date" msgid="4231005651895254033">"Modificado"</string>
<string name="directory_items" msgid="6645621978998614003">"Número de itens"</string>
<string name="sort_direction_ascending" msgid="5882787683763248102">"Crescente"</string>
<string name="sort_direction_descending" msgid="1729187589765894076">"Decrescente"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 0d0f380d0..f78601b35 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -48,7 +48,7 @@
<string name="menu_copy_to_clipboard" msgid="5064081159073330776">"Copiar"</string>
<string name="menu_paste_from_clipboard" msgid="360947260414135827">"Colar"</string>
<string name="menu_paste_into_folder" msgid="8000644546983240101">"Colar na pasta"</string>
- <string name="menu_advanced_show" msgid="7558626506462906726">"Mostrar mem. armaz. int."</string>
+ <string name="menu_advanced_show" msgid="7558626506462906726">"Mostrar armaz. interno"</string>
<string name="menu_advanced_hide" msgid="6488381508009246334">"Ocultar mem. armaz. int."</string>
<string name="button_select" msgid="240863497069321364">"Selecionar"</string>
<string name="button_copy" msgid="8219059853840996027">"Copiar"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 4bec73520..b6b5738d4 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -64,7 +64,7 @@
<string name="sort_dimension_summary" msgid="7724534446881397860">"Resumo"</string>
<string name="sort_dimension_file_type" msgid="5779709622922085381">"Tipo"</string>
<string name="sort_dimension_size" msgid="2190547351159472884">"Tamanho"</string>
- <string name="sort_dimension_date" msgid="4231005651895254033">"Modificação"</string>
+ <string name="sort_dimension_date" msgid="4231005651895254033">"Modificado"</string>
<string name="directory_items" msgid="6645621978998614003">"Número de itens"</string>
<string name="sort_direction_ascending" msgid="5882787683763248102">"Crescente"</string>
<string name="sort_direction_descending" msgid="1729187589765894076">"Decrescente"</string>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index dfb7b8eb1..3cfa1d252 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -17,7 +17,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="files_label" msgid="771781190045103748">"Fayllar"</string>
- <string name="downloads_label" msgid="5462789470049501103">"Yuklanishlar"</string>
+ <string name="downloads_label" msgid="5462789470049501103">"Yuklanmalar"</string>
<!-- no translation found for app_label (8089292432455111409) -->
<skip />
<!-- no translation found for launcher_label (799410258349837668) -->
@@ -79,7 +79,7 @@
<string name="root_type_shortcut" msgid="6059343175525442279">"Tezkor tugmalar"</string>
<string name="root_type_device" msgid="1713604128005476585">"Qurilmalar"</string>
<string name="root_type_apps" msgid="8646073235029886342">"Boshqa ilovalar"</string>
- <string name="empty" msgid="5300254272613103004">"Hech narsa yo‘q"</string>
+ <string name="empty" msgid="5300254272613103004">"Hech narsa topilmadi"</string>
<string name="no_results" msgid="2371026325236359209">"%1$s jildidan topilmadi"</string>
<string name="toast_no_application" msgid="7555319548595113121">"Faylni ochib bo‘lmadi"</string>
<string name="toast_view_in_archives_unsupported" msgid="1923221390170964845">"Arxivdagi fayllarni ochib bo‘lmadi"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 67e0c670b..ee56816a7 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -49,7 +49,7 @@
<string name="menu_paste_from_clipboard" msgid="360947260414135827">"粘贴"</string>
<string name="menu_paste_into_folder" msgid="8000644546983240101">"粘贴到文件夹中"</string>
<string name="menu_advanced_show" msgid="7558626506462906726">"显示内部存储空间"</string>
- <string name="menu_advanced_hide" msgid="6488381508009246334">"隐藏内部存储设备"</string>
+ <string name="menu_advanced_hide" msgid="6488381508009246334">"隐藏内部存储空间"</string>
<string name="button_select" msgid="240863497069321364">"选择"</string>
<string name="button_copy" msgid="8219059853840996027">"复制"</string>
<string name="button_compress" msgid="8951561310857223966">"压缩"</string>
@@ -92,8 +92,8 @@
<string name="delete_notification_title" msgid="2512757431856830792">"正在删除文件"</string>
<string name="copy_remaining" msgid="5390517377265177727">"剩余时间：<xliff:g id="DURATION">%s</xliff:g>"</string>
<plurals name="copy_begin" formatted="false" msgid="151184708996738192">
- <item quantity="other">正在复制 <xliff:g id="COUNT_1">%1$d</xliff:g> 个文件。</item>
- <item quantity="one">正在复制 <xliff:g id="COUNT_0">%1$d</xliff:g> 个文件。</item>
+ <item quantity="other">正在复制 <xliff:g id="COUNT_1">%1$d</xliff:g> 项。</item>
+ <item quantity="one">正在复制 <xliff:g id="COUNT_0">%1$d</xliff:g> 项。</item>
</plurals>
<plurals name="compress_begin" formatted="false" msgid="3534158317098678895">
<item quantity="other">正在压缩 <xliff:g id="COUNT_1">%1$d</xliff:g> 个文件。</item>
@@ -104,12 +104,12 @@
<item quantity="one">正在解压 <xliff:g id="COUNT_0">%1$d</xliff:g> 个文件。</item>
</plurals>
<plurals name="move_begin" formatted="false" msgid="1464229874265756956">
- <item quantity="other">正在移动 <xliff:g id="COUNT_1">%1$d</xliff:g> 个文件。</item>
- <item quantity="one">正在移动 <xliff:g id="COUNT_0">%1$d</xliff:g> 个文件。</item>
+ <item quantity="other">正在移动 <xliff:g id="COUNT_1">%1$d</xliff:g> 项。</item>
+ <item quantity="one">正在移动 <xliff:g id="COUNT_0">%1$d</xliff:g> 项。</item>
</plurals>
<plurals name="deleting" formatted="false" msgid="1729138001178158901">
- <item quantity="other">正在删除 <xliff:g id="COUNT_1">%1$d</xliff:g> 个文件。</item>
- <item quantity="one">正在删除 <xliff:g id="COUNT_0">%1$d</xliff:g> 个文件。</item>
+ <item quantity="other">正在删除 <xliff:g id="COUNT_1">%1$d</xliff:g> 项。</item>
+ <item quantity="one">正在删除 <xliff:g id="COUNT_0">%1$d</xliff:g> 项。</item>
</plurals>
<string name="undo" msgid="2902438994196400565">"撤消"</string>
<string name="copy_preparing" msgid="4759516490222449324">"正在准备…"</string>
diff --git a/src/com/android/documentsui/roots/ProvidersCache.java b/src/com/android/documentsui/roots/ProvidersCache.java
index 16e7106a3..152791818 100644
--- a/src/com/android/documentsui/roots/ProvidersCache.java
+++ b/src/com/android/documentsui/roots/ProvidersCache.java
@@ -241,8 +241,13 @@ public class ProvidersCache implements ProvidersAccess {
if (VERBOSE) Log.v(TAG, "Loading roots for " + authority);
final ArrayList<RootInfo> roots = new ArrayList<>();
- ProviderInfo provider = mContext.getPackageManager().resolveContentProvider(
+ final PackageManager pm = mContext.getPackageManager();
+ ProviderInfo provider = pm.resolveContentProvider(
authority, PackageManager.GET_META_DATA);
+ if (provider == null) {
+ Log.w(TAG, "Failed to get provider info for " + authority);
+ return roots;
+ }
if (!provider.exported) {
Log.w(TAG, "Provider is not exported. Failed to load roots for " + authority);
return roots;
@@ -261,7 +266,6 @@ public class ProvidersCache implements ProvidersAccess {
synchronized (mObservedAuthoritiesDetails) {
if (!mObservedAuthoritiesDetails.containsKey(authority)) {
- PackageManager pm = mContext.getPackageManager();
CharSequence appName = pm.getApplicationLabel(provider.applicationInfo);
String packageName = provider.applicationInfo.packageName;
@@ -460,7 +464,10 @@ public class ProvidersCache implements ProvidersAccess {
final Intent intent = new Intent(DocumentsContract.PROVIDER_INTERFACE);
final List<ResolveInfo> providers = pm.queryIntentContentProviders(intent, 0);
for (ResolveInfo info : providers) {
- handleDocumentsProvider(info.providerInfo);
+ ProviderInfo providerInfo = info.providerInfo;
+ if (providerInfo.authority != null) {
+ handleDocumentsProvider(providerInfo);
+ }
}
final long delta = SystemClock.elapsedRealtime() - start;
diff --git a/tests/common/com/android/documentsui/bots/UiBot.java b/tests/common/com/android/documentsui/bots/UiBot.java
index 72c35a796..355241871 100644
--- a/tests/common/com/android/documentsui/bots/UiBot.java
+++ b/tests/common/com/android/documentsui/bots/UiBot.java
@@ -250,7 +250,7 @@ public class UiBot extends Bots.BaseBot {
while (it.hasNext()) {
menuItem = it.next();
UiObject2 text = menuItem.findObject(By.text(label));
- if (text != null) {
+ if (text != null && menuItem.isClickable()) {
break;
}
}
diff --git a/tests/functional/com/android/documentsui/KeyboardNavigationUiTest.java b/tests/functional/com/android/documentsui/KeyboardNavigationUiTest.java
index 6dcad17b8..cef7913b4 100644
--- a/tests/functional/com/android/documentsui/KeyboardNavigationUiTest.java
+++ b/tests/functional/com/android/documentsui/KeyboardNavigationUiTest.java
@@ -84,6 +84,7 @@ public class KeyboardNavigationUiTest extends ActivityTest<FilesActivity> {
bots.roots.openDrawer();
bots.keyboard.pressKey(KeyEvent.KEYCODE_TAB);
+ bots.keyboard.pressKey(KeyEvent.KEYCODE_TAB);
for (int i = 0; i < 10; i++) {
bots.keyboard.pressKey(KeyEvent.KEYCODE_DPAD_RIGHT);
bots.roots.assertHasFocus();
diff --git a/tests/functional/com/android/documentsui/SearchViewUiTest.java b/tests/functional/com/android/documentsui/SearchViewUiTest.java
index e3579368c..d7ffe7c1d 100644
--- a/tests/functional/com/android/documentsui/SearchViewUiTest.java
+++ b/tests/functional/com/android/documentsui/SearchViewUiTest.java
@@ -70,6 +70,7 @@ public class SearchViewUiTest extends ActivityTest<FilesActivity> {
public void testSearchView_CollapsesOnBack() throws Exception {
bots.search.clickIcon();
device.pressBack();
+ device.pressBack();
bots.search.assertIconVisible(true);
bots.search.assertInputExists(false);
@@ -80,6 +81,7 @@ public class SearchViewUiTest extends ActivityTest<FilesActivity> {
bots.search.setInputText("file2");
device.pressBack();
+ device.pressBack();
// Wait for a file in the default directory to be listed.
bots.directory.waitForDocument(dirName1);
generated by cgit v1.2.3-59-g8ed1b (git 2.39.0) at 2025-10-20 01:11:15 +0000