summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--res/layout/item_doc_inflated_message_cross_profile.xml57
-rw-r--r--res/values-as/strings.xml6
-rw-r--r--res/values-bn/strings.xml6
-rw-r--r--res/values-bs/inspector_strings.xml2
-rw-r--r--res/values-da/inspector_strings.xml2
-rw-r--r--res/values-da/strings.xml2
-rw-r--r--res/values-es-rUS/strings.xml2
-rw-r--r--res/values-es/strings.xml10
-rw-r--r--res/values-fr-rCA/strings.xml8
-rw-r--r--res/values-gu/strings.xml6
-rw-r--r--res/values-hi/strings.xml6
-rw-r--r--res/values-ja/strings.xml2
-rw-r--r--res/values-kk/strings.xml6
-rw-r--r--res/values-kn/strings.xml6
-rw-r--r--res/values-ml/strings.xml10
-rw-r--r--res/values-mr/strings.xml6
-rw-r--r--res/values-ms/strings.xml2
-rw-r--r--res/values-ne/strings.xml12
-rw-r--r--res/values-or/strings.xml6
-rw-r--r--res/values-pa/strings.xml6
-rw-r--r--res/values-pt-rPT/strings.xml2
-rw-r--r--res/values-sl/strings.xml4
-rw-r--r--res/values-sv/strings.xml10
-rw-r--r--res/values-ta/strings.xml51
-rw-r--r--res/values-te/strings.xml6
-rw-r--r--res/values-th/strings.xml2
-rw-r--r--res/values-ur/strings.xml2
-rw-r--r--res/values-vi/strings.xml2
-rw-r--r--res/values/overlayable.xml13
-rw-r--r--src/com/android/documentsui/AbstractActionHandler.java5
-rw-r--r--src/com/android/documentsui/ActionHandler.java2
-rw-r--r--src/com/android/documentsui/BaseActivity.java4
-rw-r--r--src/com/android/documentsui/RequestQuietModeDisabledTask.java49
-rw-r--r--src/com/android/documentsui/dirlist/InflateMessageDocumentHolder.java14
-rw-r--r--src/com/android/documentsui/dirlist/Message.java11
-rw-r--r--tests/common/com/android/documentsui/testing/TestActionHandler.java7
-rw-r--r--tests/unit/com/android/documentsui/dirlist/InflateMessageDocumentHolderTest.java91
-rw-r--r--tests/unit/com/android/documentsui/dirlist/MessageTest.java11
38 files changed, 299 insertions, 150 deletions
diff --git a/res/layout/item_doc_inflated_message_cross_profile.xml b/res/layout/item_doc_inflated_message_cross_profile.xml
index eb9540d5e..337819a82 100644
--- a/res/layout/item_doc_inflated_message_cross_profile.xml
+++ b/res/layout/item_doc_inflated_message_cross_profile.xml
@@ -25,27 +25,44 @@
android:paddingStart="72dp"
android:paddingEnd="72dp">
- <ImageView
- android:id="@+id/artwork"
- android:layout_width="24dp"
- android:layout_height="24dp"/>
- <TextView
- android:id="@+id/title"
- android:layout_marginTop="8dp"
+ <ProgressBar
+ android:id="@+id/cross_profile_progress"
+ style="@android:style/Widget.Material.Light.ProgressBar"
+ android:visibility="gone"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textAppearance="@style/EmptyStateTitleText"/>
- <TextView
- android:id="@+id/message"
- android:layout_marginTop="4dp"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:gravity="center_horizontal"
- android:textAppearance="@style/EmptyStateMessageText"/>
- <Button
- android:id="@+id/button"
- android:layout_marginTop="16dp"
+ android:indeterminate="true"
+ android:indeterminateTint="?attr/colorAccent"/>
+
+ <LinearLayout
+ android:id="@+id/cross_profile_content"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- style="@style/EmptyStateButton"/>
-</LinearLayout> \ No newline at end of file
+ android:orientation="vertical"
+ android:gravity="center_horizontal">
+
+ <ImageView
+ android:id="@+id/artwork"
+ android:layout_width="24dp"
+ android:layout_height="24dp"/>
+ <TextView
+ android:id="@+id/title"
+ android:layout_marginTop="8dp"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textAppearance="@style/EmptyStateTitleText"/>
+ <TextView
+ android:id="@+id/message"
+ android:layout_marginTop="4dp"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_horizontal"
+ android:textAppearance="@style/EmptyStateMessageText"/>
+ <Button
+ android:id="@+id/button"
+ android:layout_marginTop="16dp"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ style="@style/EmptyStateButton"/>
+ </LinearLayout>
+</LinearLayout>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index 36225e712..45b1a9771 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -268,10 +268,8 @@
<string name="open_tree_button" msgid="6402871398424497776">"এই ফ\'ল্ডাৰটো ব্যৱহাৰ কৰক"</string>
<string name="open_tree_dialog_title" msgid="6339509533852318569">"<xliff:g id="APPNAME">%1$s</xliff:g>ক <xliff:g id="DIRECTORY">%2$s</xliff:g>ত থকা ফাইলসমূহ এক্সেছ কৰিবলৈ অনুমতি দিবনে?"</string>
<string name="open_tree_dialog_message" msgid="4120695398430659628">"এইটোৱে <xliff:g id="APPNAME">%1$s</xliff:g>ক <xliff:g id="DIRECTORY">%2$s</xliff:g>ত ষ্ট\'ৰ কৰি থোৱা বর্তমান আৰু ভৱিষ্যতৰ সমল এক্সেছ কৰিবলৈ দিয়ে।"</string>
- <!-- no translation found for directory_blocked_header_title (1164584889578740066) -->
- <skip />
- <!-- no translation found for directory_blocked_header_subtitle (2829150911849033408) -->
- <skip />
+ <string name="directory_blocked_header_title" msgid="1164584889578740066">"এই ফ’ল্ডাৰটো ব্যৱহাৰ কৰিব নোৱাৰি"</string>
+ <string name="directory_blocked_header_subtitle" msgid="2829150911849033408">"আপোনাৰ গোপনীয়তা সুৰক্ষিত কৰিবলৈ অন্য এটা ফ’ল্ডাৰ বাছনি কৰক"</string>
<string name="create_new_folder_button" msgid="8859613309559794890">"নতুন ফ\'ল্ডাৰ সৃষ্টি কৰক"</string>
<string name="search_bar_hint" msgid="4517366509897977321">"এই ফ’নটো সন্ধান কৰক"</string>
<string name="delete_search_history" msgid="2202015025607694515">"সন্ধান ইতিহাস মচক <xliff:g id="TEXT">%1$s</xliff:g>"</string>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 8947cb6b5..e1aa67f7b 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -268,10 +268,8 @@
<string name="open_tree_button" msgid="6402871398424497776">"এই ফোল্ডার ব্যবহার করুন"</string>
<string name="open_tree_dialog_title" msgid="6339509533852318569">"<xliff:g id="DIRECTORY">%2$s</xliff:g>-তে ফাইল অ্যাক্সেস করার অনুমতি <xliff:g id="APPNAME">%1$s</xliff:g>-কে দেবেন?"</string>
<string name="open_tree_dialog_message" msgid="4120695398430659628">"এটি <xliff:g id="APPNAME">%1$s</xliff:g>-কে <xliff:g id="DIRECTORY">%2$s</xliff:g>-তে স্টোর হওয়া বর্তমান এবং ভবিষ্যতের কন্টেন্ট অ্যাক্সেস করতে দেয়।"</string>
- <!-- no translation found for directory_blocked_header_title (1164584889578740066) -->
- <skip />
- <!-- no translation found for directory_blocked_header_subtitle (2829150911849033408) -->
- <skip />
+ <string name="directory_blocked_header_title" msgid="1164584889578740066">"এই ফোল্ডার ব্যবহার করা যাচ্ছে না"</string>
+ <string name="directory_blocked_header_subtitle" msgid="2829150911849033408">"আপনার গোপনীয়তা সুরক্ষিত রাখতে, অন্য ফোল্ডার বেছে নিন"</string>
<string name="create_new_folder_button" msgid="8859613309559794890">"নতুন ফোল্ডার তৈরি করুন"</string>
<string name="search_bar_hint" msgid="4517366509897977321">"এই ফোনে খুঁজুন"</string>
<string name="delete_search_history" msgid="2202015025607694515">"সার্চের ইতিহাস মুছুন <xliff:g id="TEXT">%1$s</xliff:g>"</string>
diff --git a/res/values-bs/inspector_strings.xml b/res/values-bs/inspector_strings.xml
index dddfb5c78..1044ceb35 100644
--- a/res/values-bs/inspector_strings.xml
+++ b/res/values-bs/inspector_strings.xml
@@ -18,7 +18,7 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="inspector_title" msgid="1924760928091740238">"Informacije"</string>
<string name="inspector_load_error" msgid="7522190243413249291">"Informacije o fajlu nisu učitane"</string>
- <string name="inspector_debug_section" msgid="2576052661505700421">"Informacije o otklanjanju grešaka (samo dev)"</string>
+ <string name="inspector_debug_section" msgid="2576052661505700421">"Informacije o ispravci grešaka (samo za programere)"</string>
<string name="inspector_debug_metadata_section" msgid="5875140675600744846">"Raw metapodaci: <xliff:g id="METADATATYPE">%1$s</xliff:g>"</string>
<string name="inspector_metadata_section" msgid="6077622515328240575">"Detalji o medijima"</string>
<string name="handler_app_file_opens_with" msgid="5272329600389613550">"Ovu vrstu fajlova otvara aplikacija"</string>
diff --git a/res/values-da/inspector_strings.xml b/res/values-da/inspector_strings.xml
index 3c0fe5ebe..30cb4a570 100644
--- a/res/values-da/inspector_strings.xml
+++ b/res/values-da/inspector_strings.xml
@@ -40,7 +40,7 @@
<string name="metadata_focal_format" msgid="8542211707962355623">"<xliff:g id="LENGTH">%1$.2f </xliff:g> mm"</string>
<string name="metadata_iso_speed_ratings" msgid="1699781252899759058">"Tilsvarende ISO-hastighed"</string>
<string name="metadata_iso_format" msgid="4153285204012694861">"ISO <xliff:g id="ISO_SPEED">%1$d</xliff:g>"</string>
- <string name="metadata_artist" msgid="8972421485694988540">"Musiker"</string>
+ <string name="metadata_artist" msgid="8972421485694988540">"Kunstner"</string>
<string name="metadata_composer" msgid="4696926808308256056">"Komponist"</string>
<string name="metadata_album" msgid="1661699531214720236">"Album"</string>
<string name="metadata_address" msgid="1849921023707744640">"Placering"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 575e48b79..fe77676d5 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -74,7 +74,7 @@
<string name="sort_dimension_size_ascending" msgid="2617359017800057762">"Størrelse (mindste først)"</string>
<string name="sort_dimension_date_ascending" msgid="7920068979386920559">"Ændret (ældste først)"</string>
<string name="sort_dimension_name_descending" msgid="1514525521100423342">"Filnavn (Å til A)"</string>
- <string name="sort_dimension_file_type_descending" msgid="3344796059784511100">"Type (Z til Å)"</string>
+ <string name="sort_dimension_file_type_descending" msgid="3344796059784511100">"Type (Å til A)"</string>
<string name="sort_dimension_size_descending" msgid="2367030017597348938">"Størrelse (største først)"</string>
<string name="sort_dimension_date_descending" msgid="5466839955763127113">"Ændret (nyeste først)"</string>
<string name="sort_dimension_dialog_title" msgid="3048641573962982157">"Sortér efter"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 348552e1f..00e1a5e32 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -35,7 +35,7 @@
<string name="menu_save" msgid="5195367497138965168">"Guardar"</string>
<string name="menu_share" msgid="4307140947108068356">"Compartir"</string>
<string name="menu_delete" msgid="1022254131543256626">"Borrar"</string>
- <string name="menu_select_all" msgid="7600576812185570403">"Seleccionar todos"</string>
+ <string name="menu_select_all" msgid="7600576812185570403">"Seleccionar todo"</string>
<string name="menu_deselect_all" msgid="7729916068862742979">"Anular la selección de todo"</string>
<string name="menu_select" msgid="1366061076507142387">"Seleccionar"</string>
<string name="menu_sort" msgid="3362419226163725275">"Ordenar por…"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 0b1031b70..7a29c579e 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -101,7 +101,7 @@
<string name="cross_profile_action_not_allowed_title" msgid="6611281348716476478">"Esta acción no está permitida"</string>
<string name="cross_profile_action_not_allowed_message" msgid="7331275433061690947">"Para obtener más información, ponte en contacto con tu administrador de TI"</string>
<string name="root_recent" msgid="1080156975424341623">"Reciente"</string>
- <string name="root_available_bytes" msgid="8269870862691408864">"<xliff:g id="SIZE">%1$s</xliff:g> de espacio libre"</string>
+ <string name="root_available_bytes" msgid="8269870862691408864">"<xliff:g id="SIZE">%1$s</xliff:g> libre"</string>
<string name="root_type_service" msgid="6521366147466512289">"Servicios almacenamiento"</string>
<string name="root_type_shortcut" msgid="6059343175525442279">"Accesos directos"</string>
<string name="root_type_device" msgid="1713604128005476585">"Dispositivos"</string>
@@ -125,8 +125,8 @@
<item quantity="one">Copiando <xliff:g id="COUNT_0">%1$d</xliff:g> elemento.</item>
</plurals>
<plurals name="compress_begin" formatted="false" msgid="3534158317098678895">
- <item quantity="other">Se están comprimiendo <xliff:g id="COUNT_1">%1$d</xliff:g> archivos.</item>
- <item quantity="one">Se está comprimiendo <xliff:g id="COUNT_0">%1$d</xliff:g> archivo.</item>
+ <item quantity="other">Comprimiendo <xliff:g id="COUNT_1">%1$d</xliff:g> archivos.</item>
+ <item quantity="one">Comprimiendo <xliff:g id="COUNT_0">%1$d</xliff:g> archivo.</item>
</plurals>
<plurals name="extract_begin" formatted="false" msgid="1006380679562903749">
<item quantity="other">Se están extrayendo <xliff:g id="COUNT_1">%1$d</xliff:g> archivos.</item>
@@ -243,7 +243,7 @@
<string name="root_info_header_media" msgid="2774453755906260852">"<xliff:g id="LABEL">%1$s</xliff:g> en el teléfono"</string>
<string name="root_info_header_downloads" msgid="8848161246921154115">"Archivos de Descargas"</string>
<string name="root_info_header_storage" msgid="2989014130584927442">"Archivos de <xliff:g id="DEVICE">%1$s</xliff:g>"</string>
- <string name="root_info_header_folder" msgid="5851172222368049864">"Archivos que hay en <xliff:g id="FOLDER">%1$s</xliff:g>"</string>
+ <string name="root_info_header_folder" msgid="5851172222368049864">"Archivos en <xliff:g id="FOLDER">%1$s</xliff:g>"</string>
<string name="root_info_header_app" msgid="2125422047558420885">"Archivos de <xliff:g id="LABEL">%1$s</xliff:g>"</string>
<string name="root_info_header_app_with_summary" msgid="3223302581236069702">"Archivos de <xliff:g id="LABEL">%1$s</xliff:g> (<xliff:g id="SUMMARY">%2$s</xliff:g>)"</string>
<string name="root_info_header_image_recent" msgid="6252335619444758201">"Imágenes recientes del teléfono"</string>
@@ -266,7 +266,7 @@
<string name="apps_row_title" msgid="3340490016663092925">"Ver archivos en otras aplicaciones"</string>
<string name="anonymous_application" msgid="7633027057951625862">"Anónimo"</string>
<string name="open_tree_button" msgid="6402871398424497776">"Utilizar esta carpeta"</string>
- <string name="open_tree_dialog_title" msgid="6339509533852318569">"¿Quieres permitir que <xliff:g id="APPNAME">%1$s</xliff:g> acceda a los archivos que hay en <xliff:g id="DIRECTORY">%2$s</xliff:g>?"</string>
+ <string name="open_tree_dialog_title" msgid="6339509533852318569">"¿Permitir que <xliff:g id="APPNAME">%1$s</xliff:g> acceda a los archivos que hay en <xliff:g id="DIRECTORY">%2$s</xliff:g>?"</string>
<string name="open_tree_dialog_message" msgid="4120695398430659628">"Esto permitirá que <xliff:g id="APPNAME">%1$s</xliff:g> acceda al contenido almacenado en <xliff:g id="DIRECTORY">%2$s</xliff:g> de ahora en adelante."</string>
<string name="directory_blocked_header_title" msgid="1164584889578740066">"Esta carpeta no se puede usar"</string>
<string name="directory_blocked_header_subtitle" msgid="2829150911849033408">"Para proteger tu privacidad, elige otra carpeta"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 646175095..38041ee07 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -71,12 +71,12 @@
<string name="sort_dimension_date" msgid="4231005651895254033">"Dernière modification"</string>
<string name="sort_dimension_name_ascending" msgid="3715725253270614742">"Nom de fichier (A à Z)"</string>
<string name="sort_dimension_file_type_ascending" msgid="3466973933402894292">"Type (A à Z)"</string>
- <string name="sort_dimension_size_ascending" msgid="2617359017800057762">"Taille (plus petit en 1er)"</string>
- <string name="sort_dimension_date_ascending" msgid="7920068979386920559">"Modif. (plus anc. en 1er)"</string>
+ <string name="sort_dimension_size_ascending" msgid="2617359017800057762">"Taille (plus petits d\'abord)"</string>
+ <string name="sort_dimension_date_ascending" msgid="7920068979386920559">"Date de modification (plus anciens d\'abord)"</string>
<string name="sort_dimension_name_descending" msgid="1514525521100423342">"Nom de fichier (Z à A)"</string>
<string name="sort_dimension_file_type_descending" msgid="3344796059784511100">"Type (Z à A)"</string>
- <string name="sort_dimension_size_descending" msgid="2367030017597348938">"Taille (plus gros en 1er)"</string>
- <string name="sort_dimension_date_descending" msgid="5466839955763127113">"Modif. (plus réc. en 1er)"</string>
+ <string name="sort_dimension_size_descending" msgid="2367030017597348938">"Taille (plus gros d\'abord)"</string>
+ <string name="sort_dimension_date_descending" msgid="5466839955763127113">"Date de modification (plus récents d\'abord)"</string>
<string name="sort_dimension_dialog_title" msgid="3048641573962982157">"Trier par"</string>
<string name="sort_dimension_button_title" msgid="1898606989130896126">"Trié par <xliff:g id="LABEL">%s</xliff:g>"</string>
<string name="directory_items" msgid="6645621978998614003">"Nombre d\'éléments"</string>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 896cd2f1e..fb4d3d83f 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -268,10 +268,8 @@
<string name="open_tree_button" msgid="6402871398424497776">"આ ફોલ્ડરનો ઉપયોગ કરો"</string>
<string name="open_tree_dialog_title" msgid="6339509533852318569">"શું <xliff:g id="APPNAME">%1$s</xliff:g>ને <xliff:g id="DIRECTORY">%2$s</xliff:g>માંની ફાઇલો ઍક્સેસ કરવાની મંજૂરી આપીએ?"</string>
<string name="open_tree_dialog_message" msgid="4120695398430659628">"આનાથી <xliff:g id="APPNAME">%1$s</xliff:g> <xliff:g id="DIRECTORY">%2$s</xliff:g>માં સ્ટોર કરેલું હાલનું અને ભાવિ કન્ટેન્ટ ઍક્સેસ કરી શકશે."</string>
- <!-- no translation found for directory_blocked_header_title (1164584889578740066) -->
- <skip />
- <!-- no translation found for directory_blocked_header_subtitle (2829150911849033408) -->
- <skip />
+ <string name="directory_blocked_header_title" msgid="1164584889578740066">"આ ફોલ્ડરનો ઉપયોગ કરી શકાતો નથી"</string>
+ <string name="directory_blocked_header_subtitle" msgid="2829150911849033408">"તમારી પ્રાઇવસી સુરક્ષિત રાખવા માટે, અન્ય ફોલ્ડર પસંદ કરો"</string>
<string name="create_new_folder_button" msgid="8859613309559794890">"નવું ફોલ્ડર બનાવો"</string>
<string name="search_bar_hint" msgid="4517366509897977321">"આ ફોન શોધો"</string>
<string name="delete_search_history" msgid="2202015025607694515">"શોધ ઇતિહાસ <xliff:g id="TEXT">%1$s</xliff:g> ડિલીટ કરો"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 07aa35189..46dbef06a 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -71,11 +71,11 @@
<string name="sort_dimension_date" msgid="4231005651895254033">"बदले जाने का समय"</string>
<string name="sort_dimension_name_ascending" msgid="3715725253270614742">"फ़ाइल का नाम (A से Z)"</string>
<string name="sort_dimension_file_type_ascending" msgid="3466973933402894292">"प्रकार (A से Z)"</string>
- <string name="sort_dimension_size_ascending" msgid="2617359017800057762">"आकार (सबसे छोटा पहले)"</string>
+ <string name="sort_dimension_size_ascending" msgid="2617359017800057762">"साइज़ (सबसे छोटा पहले)"</string>
<string name="sort_dimension_date_ascending" msgid="7920068979386920559">"बदला गया (पुरानी तारीख से)"</string>
<string name="sort_dimension_name_descending" msgid="1514525521100423342">"फ़ाइल का नाम (Z से A)"</string>
<string name="sort_dimension_file_type_descending" msgid="3344796059784511100">"प्रकार (Z से A)"</string>
- <string name="sort_dimension_size_descending" msgid="2367030017597348938">"आकार (सबसे बड़ा पहले)"</string>
+ <string name="sort_dimension_size_descending" msgid="2367030017597348938">"साइज़ (सबसे बड़ा पहले)"</string>
<string name="sort_dimension_date_descending" msgid="5466839955763127113">"बदला गया (नई तारीख से)"</string>
<string name="sort_dimension_dialog_title" msgid="3048641573962982157">"इस क्रम से लगाएं"</string>
<string name="sort_dimension_button_title" msgid="1898606989130896126">"<xliff:g id="LABEL">%s</xliff:g> से क्रम से लगाया गया"</string>
@@ -101,7 +101,7 @@
<string name="cross_profile_action_not_allowed_title" msgid="6611281348716476478">"इसकी अनुमति नहीं है"</string>
<string name="cross_profile_action_not_allowed_message" msgid="7331275433061690947">"ज़्यादा जानने के लिए, अपने आईटी एडमिन से संपर्क करें"</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_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>
<string name="root_type_device" msgid="1713604128005476585">"डिवाइस"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 9c3ad4b3c..f0eb2e788 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -271,7 +271,7 @@
<string name="directory_blocked_header_title" msgid="1164584889578740066">"このフォルダは使用できません"</string>
<string name="directory_blocked_header_subtitle" msgid="2829150911849033408">"プライバシーを保護するため、別のフォルダを選択してください"</string>
<string name="create_new_folder_button" msgid="8859613309559794890">"新規フォルダを作成"</string>
- <string name="search_bar_hint" msgid="4517366509897977321">"このスマートフォンを検索する"</string>
+ <string name="search_bar_hint" msgid="4517366509897977321">"スマートフォン内を検索"</string>
<string name="delete_search_history" msgid="2202015025607694515">"検索履歴「<xliff:g id="TEXT">%1$s</xliff:g>」を削除します"</string>
<string name="personal_tab" msgid="3878576287868528503">"個人用"</string>
<string name="work_tab" msgid="7265359366883747413">"仕事用"</string>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index cff252125..fcdbb3f69 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -22,7 +22,7 @@
<skip />
<!-- no translation found for launcher_label (799410258349837668) -->
<skip />
- <string name="title_open" msgid="3165686459158020921">"Мына қалтадан ашу:"</string>
+ <string name="title_open" msgid="3165686459158020921">"Ашу"</string>
<string name="title_save" msgid="4384490653102710025">"Сақталатын орны"</string>
<string name="menu_create_dir" msgid="2413624798689091042">"Жаңа қалта"</string>
<string name="menu_grid" msgid="1453636521731880680">"Торлы көрініс"</string>
@@ -72,11 +72,11 @@
<string name="sort_dimension_name_ascending" msgid="3715725253270614742">"Файл атауы (A–Z)"</string>
<string name="sort_dimension_file_type_ascending" msgid="3466973933402894292">"Түрі (A–Z)"</string>
<string name="sort_dimension_size_ascending" msgid="2617359017800057762">"Өлшемі (ең кішісінен бастап)"</string>
- <string name="sort_dimension_date_ascending" msgid="7920068979386920559">"Өзгертілген (ең ескісінен бастап)"</string>
+ <string name="sort_dimension_date_ascending" msgid="7920068979386920559">"Өзгертулер (ескісінен бастап)"</string>
<string name="sort_dimension_name_descending" msgid="1514525521100423342">"Файл атауы (Z–A)"</string>
<string name="sort_dimension_file_type_descending" msgid="3344796059784511100">"Түрі (Z–A)"</string>
<string name="sort_dimension_size_descending" msgid="2367030017597348938">"Өлшемі (ең үлкенінен бастап)"</string>
- <string name="sort_dimension_date_descending" msgid="5466839955763127113">"Өзгертілген (ең жаңасынан бастап)"</string>
+ <string name="sort_dimension_date_descending" msgid="5466839955763127113">"Өзгертулер (жаңасынан бастап)"</string>
<string name="sort_dimension_dialog_title" msgid="3048641573962982157">"Сұрыптау шарты"</string>
<string name="sort_dimension_button_title" msgid="1898606989130896126">"<xliff:g id="LABEL">%s</xliff:g> бойынша реттелген"</string>
<string name="directory_items" msgid="6645621978998614003">"Элементтер саны"</string>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 49143ea26..63c7c1c42 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -268,10 +268,8 @@
<string name="open_tree_button" msgid="6402871398424497776">"ಈ ಫೋಲ್ಡರ್ ಬಳಸಿ"</string>
<string name="open_tree_dialog_title" msgid="6339509533852318569">"<xliff:g id="DIRECTORY">%2$s</xliff:g> ನಲ್ಲಿರುವ ಫೈಲ್‌ಗಳಿಗೆ ಪ್ರವೇಶಿಸಲು <xliff:g id="APPNAME">%1$s</xliff:g> ಆ್ಯಪ್‌ಗೆ ಅನುಮತಿಸಬೇಕೆ?"</string>
<string name="open_tree_dialog_message" msgid="4120695398430659628">"ಇದು ಪ್ರಸ್ತುತ ಮತ್ತು ಭವಿಷ್ಯದಲ್ಲಿ <xliff:g id="DIRECTORY">%2$s</xliff:g> ನಲ್ಲಿ ಸಂಗ್ರಹವಾಗಿರುವ ವಿಷಯವನ್ನು ಪ್ರವೇಶಿಸಲು <xliff:g id="APPNAME">%1$s</xliff:g> ಆ್ಯಪ್‌ಗೆ ಅನುಮತಿಸುತ್ತದೆ."</string>
- <!-- no translation found for directory_blocked_header_title (1164584889578740066) -->
- <skip />
- <!-- no translation found for directory_blocked_header_subtitle (2829150911849033408) -->
- <skip />
+ <string name="directory_blocked_header_title" msgid="1164584889578740066">"ಈ ಫೋಲ್ಡರ್ ಅನ್ನು ಬಳಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
+ <string name="directory_blocked_header_subtitle" msgid="2829150911849033408">"ನಿಮ್ಮ ಗೌಪ್ಯತೆಯನ್ನು ಕಾಪಾಡಲು, ಬೇರೊಂದು ಫೋಲ್ಡರ್ ಅನ್ನು ಆಯ್ಕೆಮಾಡಿ"</string>
<string name="create_new_folder_button" msgid="8859613309559794890">"ಹೊಸ ಫೋಲ್ಡರ್ ರಚಿಸಿ"</string>
<string name="search_bar_hint" msgid="4517366509897977321">"ಈ ಫೋನ್‍ನಲ್ಲಿ ಹುಡುಕಿ"</string>
<string name="delete_search_history" msgid="2202015025607694515">"ಹುಡುಕಾಟ ಇತಿಹಾಸವನ್ನು ಅಳಿಸಿ <xliff:g id="TEXT">%1$s</xliff:g>"</string>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index e0502e224..96587217a 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -70,11 +70,11 @@
<string name="sort_dimension_size" msgid="2190547351159472884">"വലുപ്പം"</string>
<string name="sort_dimension_date" msgid="4231005651895254033">"പരിഷ്‌ക്കരിച്ചു"</string>
<string name="sort_dimension_name_ascending" msgid="3715725253270614742">"ഫയലിൻ്റെ പേര് (A - Z)"</string>
- <string name="sort_dimension_file_type_ascending" msgid="3466973933402894292">"ടൈപ്പ് ചെയ്യൂ (A - Z)"</string>
+ <string name="sort_dimension_file_type_ascending" msgid="3466973933402894292">"തരം (A - Z)"</string>
<string name="sort_dimension_size_ascending" msgid="2617359017800057762">"വലുപ്പം (ചെറുത് ആദ്യം)"</string>
<string name="sort_dimension_date_ascending" msgid="7920068979386920559">"പരിഷ്ക്കരിച്ചത് (പഴയത് ആദ്യം)"</string>
<string name="sort_dimension_name_descending" msgid="1514525521100423342">"ഫയലിൻ്റെ പേര് (Z - A)"</string>
- <string name="sort_dimension_file_type_descending" msgid="3344796059784511100">"ടൈപ്പ് ചെയ്യൂ (Z - A)"</string>
+ <string name="sort_dimension_file_type_descending" msgid="3344796059784511100">"തരം (Z - A)"</string>
<string name="sort_dimension_size_descending" msgid="2367030017597348938">"വലുപ്പം (വലുത് ആദ്യം)"</string>
<string name="sort_dimension_date_descending" msgid="5466839955763127113">"പരിഷ്ക്കരിച്ചത് (പുതിയത് ആദ്യം)"</string>
<string name="sort_dimension_dialog_title" msgid="3048641573962982157">"ഇപ്രകാരം അടുക്കുക"</string>
@@ -268,10 +268,8 @@
<string name="open_tree_button" msgid="6402871398424497776">"ഈ ഫോൾഡർ ഉപയോഗിക്കുക"</string>
<string name="open_tree_dialog_title" msgid="6339509533852318569">"<xliff:g id="DIRECTORY">%2$s</xliff:g> എന്നതിലെ ഫയലുകൾ ആക്സസ് ചെയ്യാൻ <xliff:g id="APPNAME">%1$s</xliff:g> എന്നതിനെ അനുവദിക്കണോ?"</string>
<string name="open_tree_dialog_message" msgid="4120695398430659628">"ഇത് <xliff:g id="APPNAME">%1$s</xliff:g> എന്നതിനെ <xliff:g id="DIRECTORY">%2$s</xliff:g> എന്നതിൽ നിലവിൽ സംഭരിച്ചിട്ടുള്ളതും ഭാവിയിൽ സംഭരിക്കുന്നതുമായ ഉള്ളടക്കം ആക്സസ് ചെയ്യാൻ അനുവദിക്കും."</string>
- <!-- no translation found for directory_blocked_header_title (1164584889578740066) -->
- <skip />
- <!-- no translation found for directory_blocked_header_subtitle (2829150911849033408) -->
- <skip />
+ <string name="directory_blocked_header_title" msgid="1164584889578740066">"ഈ ഫോൾഡർ ഉപയോഗിക്കാനാവില്ല"</string>
+ <string name="directory_blocked_header_subtitle" msgid="2829150911849033408">"നിങ്ങളുടെ സ്വകാര്യത പരിരക്ഷിക്കാൻ മറ്റൊരു ഫോൾഡർ തിരഞ്ഞെടുക്കുക"</string>
<string name="create_new_folder_button" msgid="8859613309559794890">"പുതിയ ഫോൾഡർ സൃഷ്‌ടിക്കുക"</string>
<string name="search_bar_hint" msgid="4517366509897977321">"ഈ ഫോണിൽ തിരയുക"</string>
<string name="delete_search_history" msgid="2202015025607694515">"തിരയൽ ചരിത്രം <xliff:g id="TEXT">%1$s</xliff:g> ഇല്ലാതാക്കുക"</string>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 9119c7f74..8204b1b6a 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -268,10 +268,8 @@
<string name="open_tree_button" msgid="6402871398424497776">"हे फोल्डर वापरा"</string>
<string name="open_tree_dialog_title" msgid="6339509533852318569">"<xliff:g id="DIRECTORY">%2$s</xliff:g> मधील फाइल ॲक्सेस करण्यासाठी <xliff:g id="APPNAME">%1$s</xliff:g> ला अनुमती द्यायची आहे का?"</string>
<string name="open_tree_dialog_message" msgid="4120695398430659628">"असे केल्याने, <xliff:g id="DIRECTORY">%2$s</xliff:g> मधील सध्याचा आणि भविष्यातील आशय ॲक्सेस करण्याची <xliff:g id="APPNAME">%1$s</xliff:g> ला अनुमती देते."</string>
- <!-- no translation found for directory_blocked_header_title (1164584889578740066) -->
- <skip />
- <!-- no translation found for directory_blocked_header_subtitle (2829150911849033408) -->
- <skip />
+ <string name="directory_blocked_header_title" msgid="1164584889578740066">"हे फोल्डर वापरू शकत नाही"</string>
+ <string name="directory_blocked_header_subtitle" msgid="2829150911849033408">"तुमच्या गोपनीयतेचे संरक्षण करण्यासाठी दुसरे फोल्डर निवडा"</string>
<string name="create_new_folder_button" msgid="8859613309559794890">"नवीन फोल्डर तयार करा"</string>
<string name="search_bar_hint" msgid="4517366509897977321">"या फोनमध्ये शोधा"</string>
<string name="delete_search_history" msgid="2202015025607694515">"<xliff:g id="TEXT">%1$s</xliff:g> चा शोध इतिहास हटवा"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index a1d4bee8e..06f8d731e 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -22,7 +22,7 @@
<skip />
<!-- no translation found for launcher_label (799410258349837668) -->
<skip />
- <string name="title_open" msgid="3165686459158020921">"Buka dari"</string>
+ <string name="title_open" msgid="3165686459158020921">"Buka daripada"</string>
<string name="title_save" msgid="4384490653102710025">"Simpan ke"</string>
<string name="menu_create_dir" msgid="2413624798689091042">"Folder baharu"</string>
<string name="menu_grid" msgid="1453636521731880680">"Paparan grid"</string>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 836d0e6c2..6c2b42e06 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -75,7 +75,7 @@
<string name="sort_dimension_date_ascending" msgid="7920068979386920559">"परिमार्जित गरियो (सबैभन्दा पुरानो पहिले)"</string>
<string name="sort_dimension_name_descending" msgid="1514525521100423342">"फाइलको नाम (ज्ञ देखि क)"</string>
<string name="sort_dimension_file_type_descending" msgid="3344796059784511100">"प्रकार (ज्ञ देखि क)"</string>
- <string name="sort_dimension_size_descending" msgid="2367030017597348938">"आकार (सबैभन्दा ठूलो पहिले)"</string>
+ <string name="sort_dimension_size_descending" msgid="2367030017597348938">"आकार (सबैभन्दा ठुलो पहिले)"</string>
<string name="sort_dimension_date_descending" msgid="5466839955763127113">"परिमार्जित गरियो (सबभन्दा नयाँ पहिलो)"</string>
<string name="sort_dimension_dialog_title" msgid="3048641573962982157">"यसअनुसार क्रमबद्ध गर्नुहोस्"</string>
<string name="sort_dimension_button_title" msgid="1898606989130896126">"<xliff:g id="LABEL">%s</xliff:g> द्वारा क्रमबद्ध गरियो"</string>
@@ -88,8 +88,8 @@
<string name="save_error" msgid="8631128801982095782">"कागजातलाई सुरक्षित गर्न सकिएन"</string>
<string name="create_error" msgid="3092144450044861994">"फोल्डर सिर्जना गर्न सकिएन"</string>
<string name="query_error" msgid="6625421453613879336">"यस समय सामग्री लोड गर्न सकिँदैन"</string>
- <string name="quiet_mode_error_title" msgid="9126656325282792843">"कार्यलयको प्रोफाइल रोकिएको छ"</string>
- <string name="quiet_mode_button" msgid="6977115032320235420">"सक्रिय गर्नुहोस्"</string>
+ <string name="quiet_mode_error_title" msgid="9126656325282792843">"कार्यलयको प्रोफाइल अस्थायी रूपमा रोक्का गरिएको छ"</string>
+ <string name="quiet_mode_button" msgid="6977115032320235420">"सक्रिय गरियोस्"</string>
<string name="cant_select_work_files_error_title" msgid="6688716319549644354">"कार्यालयका फाइलहरू चयन गर्न सकिएन"</string>
<string name="cant_select_work_files_error_message" msgid="683480676150690641">"तपाईंका IT प्रशासकले तपाईंलाई व्यक्तिगत अनुप्रयोगमार्फत कार्यालयका फाइलहरू प्रयोग गर्ने अनुमति दिनुभएको छैन"</string>
<string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"व्यक्तिगत फाइलहरू चयन गर्न सकिएन"</string>
@@ -268,10 +268,8 @@
<string name="open_tree_button" msgid="6402871398424497776">"यो फोल्डर प्रयोग गर्नुहोस्"</string>
<string name="open_tree_dialog_title" msgid="6339509533852318569">"<xliff:g id="APPNAME">%1$s</xliff:g> लाई <xliff:g id="DIRECTORY">%2$s</xliff:g> मा भएका फाइलहरूमाथि पहुँच राख्न दिने हो?"</string>
<string name="open_tree_dialog_message" msgid="4120695398430659628">"यसले <xliff:g id="APPNAME">%1$s</xliff:g> लाई <xliff:g id="DIRECTORY">%2$s</xliff:g> मा सुरक्षित गरिएका वर्तमान र भविष्यका सामग्रीमाथि पहुँच राख्न अनुमति दिन्छ।"</string>
- <!-- no translation found for directory_blocked_header_title (1164584889578740066) -->
- <skip />
- <!-- no translation found for directory_blocked_header_subtitle (2829150911849033408) -->
- <skip />
+ <string name="directory_blocked_header_title" msgid="1164584889578740066">"यो फोल्डर प्रयोग गर्न सकिएन"</string>
+ <string name="directory_blocked_header_subtitle" msgid="2829150911849033408">"आफ्नो गोपनीयताको संरक्षण गर्न अर्को फोल्डर छान्नुहोस्"</string>
<string name="create_new_folder_button" msgid="8859613309559794890">"नयाँ फोल्डर सिर्जना गर्नुहोस्"</string>
<string name="search_bar_hint" msgid="4517366509897977321">"यो फोनमा खोज्नुहोस्"</string>
<string name="delete_search_history" msgid="2202015025607694515">"खोजसम्बन्धी इतिहास मेट्नुहोस् <xliff:g id="TEXT">%1$s</xliff:g>"</string>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index 02fdccba9..db01eee93 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -268,10 +268,8 @@
<string name="open_tree_button" msgid="6402871398424497776">"ଏହି ଫୋଲ୍ଡର୍ ବ୍ୟବହାର କରନ୍ତୁ"</string>
<string name="open_tree_dialog_title" msgid="6339509533852318569">"<xliff:g id="DIRECTORY">%2$s</xliff:g>ରେ ଫାଇଲ୍‍ଗୁଡ଼ିକୁ ଆକ୍ସେସ୍ କରିବାକୁ <xliff:g id="APPNAME">%1$s</xliff:g>କୁ ଅନୁମତି ଦେବେ?"</string>
<string name="open_tree_dialog_message" msgid="4120695398430659628">"ଏହା <xliff:g id="DIRECTORY">%2$s</xliff:g>ରେ ଷ୍ଟୋର୍ କରଯାଇଥିବା ବର୍ତ୍ତମାନ ଏବଂ ଭବିଷ୍ୟତର ବିଷୟବସ୍ତୁ <xliff:g id="APPNAME">%1$s</xliff:g> ଆକ୍ସେସ୍ କରିବାକୁ ଦେବ।"</string>
- <!-- no translation found for directory_blocked_header_title (1164584889578740066) -->
- <skip />
- <!-- no translation found for directory_blocked_header_subtitle (2829150911849033408) -->
- <skip />
+ <string name="directory_blocked_header_title" msgid="1164584889578740066">"ଏହି ଫୋଲ୍ଡରକୁ ବ୍ୟବହାର କରାଯାଇପାରିବ ନାହିଁ"</string>
+ <string name="directory_blocked_header_subtitle" msgid="2829150911849033408">"ଆପଣଙ୍କ ଗୋପନୀୟତାକୁ ସୁରକ୍ଷିତ କରିବାକୁ ଅନ୍ୟ ଏକ ଫୋଲ୍ଡର୍ ବାଛନ୍ତୁ"</string>
<string name="create_new_folder_button" msgid="8859613309559794890">"ନୂଆ ଫୋଲ୍ଡର୍ ତିଆରି କରନ୍ତୁ"</string>
<string name="search_bar_hint" msgid="4517366509897977321">"ଏହି ଫୋନ୍‌ ଖୋଜନ୍ତୁ"</string>
<string name="delete_search_history" msgid="2202015025607694515">"ସର୍ଚ୍ଚ ଇତିବୃତ୍ତି <xliff:g id="TEXT">%1$s</xliff:g>କୁ ଡିଲିଟ୍‌ କରନ୍ତୁ"</string>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 940bdf3b0..e60ab74f5 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -268,10 +268,8 @@
<string name="open_tree_button" msgid="6402871398424497776">"ਇਹ ਫੋਲਡਰ ਵਰਤੋ"</string>
<string name="open_tree_dialog_title" msgid="6339509533852318569">"ਕੀ <xliff:g id="APPNAME">%1$s</xliff:g> ਨੂੰ <xliff:g id="DIRECTORY">%2$s</xliff:g> ਵਿਚਲੀਆਂ ਫ਼ਾਈਲਾਂ ਤੱਕ ਪਹੁੰਚ ਦੇਣੀ ਹੈ?"</string>
<string name="open_tree_dialog_message" msgid="4120695398430659628">"ਇਸ ਨਾਲ <xliff:g id="APPNAME">%1$s</xliff:g> ਨੂੰ <xliff:g id="DIRECTORY">%2$s</xliff:g> ਵਿੱਚ ਸਟੋਰ ਕੀਤੀ ਵਰਤਮਾਨ ਅਤੇ ਭਵਿੱਖੀ ਸਮੱਗਰੀ ਤੱਕ ਪਹੁੰਚ ਮਿਲੇਗੀ।"</string>
- <!-- no translation found for directory_blocked_header_title (1164584889578740066) -->
- <skip />
- <!-- no translation found for directory_blocked_header_subtitle (2829150911849033408) -->
- <skip />
+ <string name="directory_blocked_header_title" msgid="1164584889578740066">"ਇਹ ਫੋਲਡਰ ਨਹੀਂ ਵਰਤਿਆ ਜਾ ਸਕਦਾ"</string>
+ <string name="directory_blocked_header_subtitle" msgid="2829150911849033408">"ਆਪਣੀ ਪਰਦੇਦਾਰੀ ਦੀ ਸੁਰੱਖਿਆ ਲਈ, ਕੋਈ ਹੋਰ ਫੋਲਡਰ ਚੁਣੋ"</string>
<string name="create_new_folder_button" msgid="8859613309559794890">"ਨਵਾਂ ਫੋਲਡਰ ਬਣਾਓ"</string>
<string name="search_bar_hint" msgid="4517366509897977321">"ਇਹ ਫ਼ੋਨ ਖੋਜੋ"</string>
<string name="delete_search_history" msgid="2202015025607694515">"ਖੋਜ ਇਤਿਹਾਸ ਮਿਟਾਓ <xliff:g id="TEXT">%1$s</xliff:g>"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index b56401964..eb04d0baf 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -266,7 +266,7 @@
<string name="apps_row_title" msgid="3340490016663092925">"Procure ficheiros noutras aplicações"</string>
<string name="anonymous_application" msgid="7633027057951625862">"Anónimo"</string>
<string name="open_tree_button" msgid="6402871398424497776">"Utilizar esta pasta"</string>
- <string name="open_tree_dialog_title" msgid="6339509533852318569">"Pretende permitir que a aplicação <xliff:g id="APPNAME">%1$s</xliff:g> aceda aos ficheiros em <xliff:g id="DIRECTORY">%2$s</xliff:g>?"</string>
+ <string name="open_tree_dialog_title" msgid="6339509533852318569">"Permitir que a aplicação <xliff:g id="APPNAME">%1$s</xliff:g> aceda aos ficheiros em <xliff:g id="DIRECTORY">%2$s</xliff:g>?"</string>
<string name="open_tree_dialog_message" msgid="4120695398430659628">"Esta ação permite que a aplicação <xliff:g id="APPNAME">%1$s</xliff:g> aceda ao conteúdo atual e futuro armazenado em <xliff:g id="DIRECTORY">%2$s</xliff:g>."</string>
<string name="directory_blocked_header_title" msgid="1164584889578740066">"Não é possível utilizar esta pasta"</string>
<string name="directory_blocked_header_subtitle" msgid="2829150911849033408">"Para proteger a sua privacidade, escolha outra pasta."</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 3e531eab5..e8b26d517 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -72,11 +72,11 @@
<string name="sort_dimension_name_ascending" msgid="3715725253270614742">"Ime datoteke (od A do Ž)"</string>
<string name="sort_dimension_file_type_ascending" msgid="3466973933402894292">"Vrsta (od A do Ž)"</string>
<string name="sort_dimension_size_ascending" msgid="2617359017800057762">"Velikost (od najmanjše)"</string>
- <string name="sort_dimension_date_ascending" msgid="7920068979386920559">"Spremenjeno (od najstarejše)"</string>
+ <string name="sort_dimension_date_ascending" msgid="7920068979386920559">"Spremenjeno (najprej najstarejše)"</string>
<string name="sort_dimension_name_descending" msgid="1514525521100423342">"Ime datoteke (od Ž do A)"</string>
<string name="sort_dimension_file_type_descending" msgid="3344796059784511100">"Vrsta (od Ž do A)"</string>
<string name="sort_dimension_size_descending" msgid="2367030017597348938">"Velikost (od največje)"</string>
- <string name="sort_dimension_date_descending" msgid="5466839955763127113">"Spremenjeno (od najnovejše)"</string>
+ <string name="sort_dimension_date_descending" msgid="5466839955763127113">"Spremenjeno (najprej najnovejše)"</string>
<string name="sort_dimension_dialog_title" msgid="3048641573962982157">"Razvrsti po"</string>
<string name="sort_dimension_button_title" msgid="1898606989130896126">"Razvrščeno po: <xliff:g id="LABEL">%s</xliff:g>"</string>
<string name="directory_items" msgid="6645621978998614003">"Število elementov"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 7f4902f41..a711267dc 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -69,13 +69,13 @@
<string name="sort_dimension_file_type" msgid="5779709622922085381">"Filtyp"</string>
<string name="sort_dimension_size" msgid="2190547351159472884">"Storlek"</string>
<string name="sort_dimension_date" msgid="4231005651895254033">"Ändrades senast"</string>
- <string name="sort_dimension_name_ascending" msgid="3715725253270614742">"Filnamn (A till Z)"</string>
- <string name="sort_dimension_file_type_ascending" msgid="3466973933402894292">"Typ (A till Z)"</string>
+ <string name="sort_dimension_name_ascending" msgid="3715725253270614742">"Filnamn (A till Ö)"</string>
+ <string name="sort_dimension_file_type_ascending" msgid="3466973933402894292">"Typ (A till Ö)"</string>
<string name="sort_dimension_size_ascending" msgid="2617359017800057762">"Storlek (minsta först)"</string>
<string name="sort_dimension_date_ascending" msgid="7920068979386920559">"Ändrad (äldsta först)"</string>
- <string name="sort_dimension_name_descending" msgid="1514525521100423342">"Filnamn (Z till A)"</string>
- <string name="sort_dimension_file_type_descending" msgid="3344796059784511100">"Typ (Z till A)"</string>
- <string name="sort_dimension_size_descending" msgid="2367030017597348938">"Size (största först)"</string>
+ <string name="sort_dimension_name_descending" msgid="1514525521100423342">"Filnamn (Ö till A)"</string>
+ <string name="sort_dimension_file_type_descending" msgid="3344796059784511100">"Typ (Ö till A)"</string>
+ <string name="sort_dimension_size_descending" msgid="2367030017597348938">"Storlek (största först)"</string>
<string name="sort_dimension_date_descending" msgid="5466839955763127113">"Ändrade (senaste först)"</string>
<string name="sort_dimension_dialog_title" msgid="3048641573962982157">"Sortera efter"</string>
<string name="sort_dimension_button_title" msgid="1898606989130896126">"Sorterat efter <xliff:g id="LABEL">%s</xliff:g>"</string>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index f04cdc33e..c3fb48dee 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -88,30 +88,18 @@
<string name="save_error" msgid="8631128801982095782">"ஆவணத்தைச் சேமிக்க முடியவில்லை"</string>
<string name="create_error" msgid="3092144450044861994">"கோப்புறையை உருவாக்க முடியவில்லை"</string>
<string name="query_error" msgid="6625421453613879336">"தற்போது உள்ளடக்கத்தை ஏற்ற முடியவில்லை"</string>
- <!-- no translation found for quiet_mode_error_title (9126656325282792843) -->
- <skip />
- <!-- no translation found for quiet_mode_button (6977115032320235420) -->
- <skip />
- <!-- no translation found for cant_select_work_files_error_title (6688716319549644354) -->
- <skip />
- <!-- no translation found for cant_select_work_files_error_message (683480676150690641) -->
- <skip />
- <!-- no translation found for cant_select_personal_files_error_title (3200697170148617742) -->
- <skip />
- <!-- no translation found for cant_select_personal_files_error_message (4105905035459118209) -->
- <skip />
- <!-- no translation found for cant_save_to_work_error_title (1351323070040641358) -->
- <skip />
- <!-- no translation found for cant_save_to_work_error_message (4975583233814059890) -->
- <skip />
- <!-- no translation found for cant_save_to_personal_error_title (858327493694069780) -->
- <skip />
- <!-- no translation found for cant_save_to_personal_error_message (6991758723736381751) -->
- <skip />
- <!-- no translation found for cross_profile_action_not_allowed_title (6611281348716476478) -->
- <skip />
- <!-- no translation found for cross_profile_action_not_allowed_message (7331275433061690947) -->
- <skip />
+ <string name="quiet_mode_error_title" msgid="9126656325282792843">"பணிக் கணக்கு இடைநிறுத்தப்பட்டது"</string>
+ <string name="quiet_mode_button" msgid="6977115032320235420">"ஆன் செய்"</string>
+ <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"பணிக் கோப்புகளைத் தேர்ந்தெடுக்க முடியாது"</string>
+ <string name="cant_select_work_files_error_message" msgid="683480676150690641">"பணிக் கோப்புகளைத் தனிப்பட்ட பணி ஆப்ஸில் இருந்து அணுகுவதை உங்கள் IT நிர்வாகி அனுமதிக்கவில்லை"</string>
+ <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"தனிப்பட்ட ஃபைல்களைத் தேர்ந்தெடுக்க முடியாது"</string>
+ <string name="cant_select_personal_files_error_message" msgid="4105905035459118209">"தனிப்பட்ட கோப்புகளைப் பணி ஆப்ஸில் இருந்து அணுகுவதை உங்கள் IT நிர்வாகி அனுமதிக்கவில்லை"</string>
+ <string name="cant_save_to_work_error_title" msgid="1351323070040641358">"பணிக் கணக்கில் சேமிக்க முடியாது"</string>
+ <string name="cant_save_to_work_error_message" msgid="4975583233814059890">"தனிப்பட்ட கோப்புகளைப் பணிக் கணக்கில் சேமிக்க உங்கள் IT நிர்வாகி அனுமதிக்கவில்லை"</string>
+ <string name="cant_save_to_personal_error_title" msgid="858327493694069780">"தனிப்பட்ட கணக்கில் சேமிக்க முடியாது"</string>
+ <string name="cant_save_to_personal_error_message" msgid="6991758723736381751">"பணிக் கோப்புகளைத் தனிப்பட்ட கணக்கில் சேமிக்க உங்கள் IT நிர்வாகி அனுமதிக்கவில்லை"</string>
+ <string name="cross_profile_action_not_allowed_title" msgid="6611281348716476478">"இந்தச் செயலுக்கு அனுமதியில்லை"</string>
+ <string name="cross_profile_action_not_allowed_message" msgid="7331275433061690947">"மேலும் அறிய IT நிர்வாகியைத் தொடர்புகொள்ளவும்"</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>
@@ -274,23 +262,18 @@
<string name="input_hint_new_folder" msgid="479672411219725677">"கோப்புறையின் பெயர்"</string>
<string name="input_hint_rename" msgid="8390711744270994452">"புதிய பெயர்"</string>
<string name="preview_file" msgid="4056622696305432343">"<xliff:g id="FILENAME">%1$s</xliff:g> என்ற ஃபைல் மாதிரிக்காட்சியாகத் தெரியும்"</string>
- <!-- no translation found for preview_work_file (4495643735563487273) -->
- <skip />
+ <string name="preview_work_file" msgid="4495643735563487273">"<xliff:g id="FILENAME">%1$s</xliff:g> என்ற பணிக் கோப்பின் மாதிரிக்காட்சியைப் பார்க்கவும்"</string>
<string name="apps_row_title" msgid="3340490016663092925">"ஃபைல்களை வேறு ஆப்ஸில் தேடவும்"</string>
<string name="anonymous_application" msgid="7633027057951625862">"பெயர் குறிப்பிடாதது"</string>
<string name="open_tree_button" msgid="6402871398424497776">"இந்தக் கோப்புறையைப் பயன்படுத்து"</string>
<string name="open_tree_dialog_title" msgid="6339509533852318569">"<xliff:g id="DIRECTORY">%2$s</xliff:g> இல் உள்ள ஃபைல்களை அணுக <xliff:g id="APPNAME">%1$s</xliff:g> ஆப்ஸை அனுமதிக்கவா?"</string>
<string name="open_tree_dialog_message" msgid="4120695398430659628">"இது <xliff:g id="DIRECTORY">%2$s</xliff:g> இல் சேமிக்கப்பட்டுள்ள தற்போதைய மற்றும் வருங்கால உள்ளடக்கத்தை அணுக <xliff:g id="APPNAME">%1$s</xliff:g> ஆப்ஸை அனுமதிக்கும்."</string>
- <!-- no translation found for directory_blocked_header_title (1164584889578740066) -->
- <skip />
- <!-- no translation found for directory_blocked_header_subtitle (2829150911849033408) -->
- <skip />
- <!-- no translation found for create_new_folder_button (8859613309559794890) -->
- <skip />
+ <string name="directory_blocked_header_title" msgid="1164584889578740066">"கோப்புறையைப் பயன்படுத்த இயலாது"</string>
+ <string name="directory_blocked_header_subtitle" msgid="2829150911849033408">"உங்கள் தனியுரிமையைப் பாதுகாக்க மற்றொரு கோப்புறையைத் தேர்வுசெய்யவும்"</string>
+ <string name="create_new_folder_button" msgid="8859613309559794890">"புதிய கோப்புறையை உருவாக்கு"</string>
<string name="search_bar_hint" msgid="4517366509897977321">"இந்த மொபைலில் தேடவும்"</string>
<string name="delete_search_history" msgid="2202015025607694515">"தேடல் வரலாற்றை நீக்கும் பட்டன் <xliff:g id="TEXT">%1$s</xliff:g>"</string>
<string name="personal_tab" msgid="3878576287868528503">"தனிப்பட்டவை"</string>
<string name="work_tab" msgid="7265359366883747413">"பணி"</string>
- <!-- no translation found for a11y_work (7504431382825242153) -->
- <skip />
+ <string name="a11y_work" msgid="7504431382825242153">"பணி"</string>
</resources>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 3dfdd603a..2b7ea2160 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -268,10 +268,8 @@
<string name="open_tree_button" msgid="6402871398424497776">"ఈ ఫోల్డర్‌ను ఉపయోగించండి"</string>
<string name="open_tree_dialog_title" msgid="6339509533852318569">"<xliff:g id="DIRECTORY">%2$s</xliff:g>లోని ఫైల్‌లను యాక్సెస్ చేయడానికి <xliff:g id="APPNAME">%1$s</xliff:g>ని అనుమతించాలా?"</string>
<string name="open_tree_dialog_message" msgid="4120695398430659628">"ఇది <xliff:g id="DIRECTORY">%2$s</xliff:g>లో నిల్వ చేసిన ప్రస్తుత మరియు భవిష్యత్తు కంటెంట్‌ను <xliff:g id="APPNAME">%1$s</xliff:g> యాక్సెస్ చేయడానికి అనుమతిస్తుంది."</string>
- <!-- no translation found for directory_blocked_header_title (1164584889578740066) -->
- <skip />
- <!-- no translation found for directory_blocked_header_subtitle (2829150911849033408) -->
- <skip />
+ <string name="directory_blocked_header_title" msgid="1164584889578740066">"ఈ ఫోల్డర్‌ను ఉపయోగించడం సాధ్యం కాదు"</string>
+ <string name="directory_blocked_header_subtitle" msgid="2829150911849033408">"మీ గోప్యతను కాపాడుకోవటానికి, మరొక ఫోల్డర్‌ను ఎంచుకోండి"</string>
<string name="create_new_folder_button" msgid="8859613309559794890">"కొత్త ఫోల్డర్‌ని సృష్టించు"</string>
<string name="search_bar_hint" msgid="4517366509897977321">"ఈ ఫోన్‌లో వెతకండి"</string>
<string name="delete_search_history" msgid="2202015025607694515">"శోధన చరిత్ర <xliff:g id="TEXT">%1$s</xliff:g>ను తొలగించండి"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 41d664b2d..b9376f64e 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -271,7 +271,7 @@
<string name="directory_blocked_header_title" msgid="1164584889578740066">"ใช้โฟลเดอร์นี้ไม่ได้"</string>
<string name="directory_blocked_header_subtitle" msgid="2829150911849033408">"เลือกโฟลเดอร์อื่นเพื่อปกป้องความเป็นส่วนตัว"</string>
<string name="create_new_folder_button" msgid="8859613309559794890">"สร้างโฟลเดอร์ใหม่"</string>
- <string name="search_bar_hint" msgid="4517366509897977321">"ค้นหาโทรศัพท์เครื่องนี้"</string>
+ <string name="search_bar_hint" msgid="4517366509897977321">"ค้นหาในโทรศัพท์เครื่องนี้"</string>
<string name="delete_search_history" msgid="2202015025607694515">"ลบประวัติการค้นหา <xliff:g id="TEXT">%1$s</xliff:g>"</string>
<string name="personal_tab" msgid="3878576287868528503">"ส่วนตัว"</string>
<string name="work_tab" msgid="7265359366883747413">"งาน"</string>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 1b47a44cd..269ed2fe1 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -242,7 +242,7 @@
<string name="root_info_header_global_search" msgid="9099308729787003373">"فون میں فائلز"</string>
<string name="root_info_header_media" msgid="2774453755906260852">"فون پر <xliff:g id="LABEL">%1$s</xliff:g>"</string>
<string name="root_info_header_downloads" msgid="8848161246921154115">"ڈاؤن لوڈز میں فائلز"</string>
- <string name="root_info_header_storage" msgid="2989014130584927442">"<xliff:g id="DEVICE">%1$s</xliff:g> میں فائلز"</string>
+ <string name="root_info_header_storage" msgid="2989014130584927442">"‫<xliff:g id="DEVICE">%1$s</xliff:g> میں فائلز"</string>
<string name="root_info_header_folder" msgid="5851172222368049864">"<xliff:g id="FOLDER">%1$s</xliff:g> میں فائلز"</string>
<string name="root_info_header_app" msgid="2125422047558420885">"<xliff:g id="LABEL">%1$s</xliff:g> کی جانب سے فائلز"</string>
<string name="root_info_header_app_with_summary" msgid="3223302581236069702">"<xliff:g id="LABEL">%1$s</xliff:g> / <xliff:g id="SUMMARY">%2$s</xliff:g> کی جانب سے فائلز"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 3afef29c6..e7bc0f89e 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -112,7 +112,7 @@
<string name="toast_view_in_archives_unsupported" msgid="1923221390170964845">"Không thể mở tệp trong lưu trữ"</string>
<string name="toast_failed_delete" msgid="3453846588205817591">"Không thể xóa một số tài liệu"</string>
<string name="toast_share_over_limit" msgid="5805442886537093015">"Bạn không thể chia sẻ quá <xliff:g id="COUNT">%1$d</xliff:g> tệp"</string>
- <string name="toast_action_not_allowed" msgid="1329382474450572415">"Hành động này không được cho phép"</string>
+ <string name="toast_action_not_allowed" msgid="1329382474450572415">"Thao tác này không được phép"</string>
<string name="share_via" msgid="8725082736005677161">"Chia sẻ qua"</string>
<string name="copy_notification_title" msgid="52256435625098456">"Đang sao chép tệp"</string>
<string name="compress_notification_title" msgid="6830195148113751021">"Nén tệp"</string>
diff --git a/res/values/overlayable.xml b/res/values/overlayable.xml
index a5dd6453f..621de83d4 100644
--- a/res/values/overlayable.xml
+++ b/res/values/overlayable.xml
@@ -15,6 +15,19 @@
-->
<!-- The collection of resources for theming the appearance of a device -->
+<!-- TODO: Resolving resource overlay for Q module updates. Remove when public.xml is
+ removed from DocumentsUIGoogle.
+ Add a new entry to DocumentsUIGoogle public.xml when adding new resource here.
+ Follow these steps to identify a new resource id for the resource.
+ 1. Find last resource id for the particular type.
+ bool, string, etc.
+ Example: <public type="bool" name="pre_existing_bool" id="0x7f04001a" />
+ bool last resource id is 0x7f04001a
+ First 6 characters are an identifier for bool, so the id should be
+ 0x7f04xxxx where xxxx is 001a+1 = 001b.
+ 4. Add entry to public.xml
+ Example: <public type="bool" name="new_bool_config" id="0x7f04001b" />
+-->
<resources xmlns:android="http://schemas.android.com/apk/res/android">
<overlayable name="DocumentsUICustomization">
diff --git a/src/com/android/documentsui/AbstractActionHandler.java b/src/com/android/documentsui/AbstractActionHandler.java
index c450c70de..53c507ef3 100644
--- a/src/com/android/documentsui/AbstractActionHandler.java
+++ b/src/com/android/documentsui/AbstractActionHandler.java
@@ -177,6 +177,11 @@ public abstract class AbstractActionHandler<T extends FragmentActivity & CommonA
}
@Override
+ public void requestQuietModeDisabled(RootInfo info, UserId userId) {
+ new RequestQuietModeDisabledTask(mActivity, userId).execute();
+ }
+
+ @Override
public void onActivityResult(int requestCode, int resultCode, Intent data) {
switch (requestCode) {
case CODE_AUTHENTICATION:
diff --git a/src/com/android/documentsui/ActionHandler.java b/src/com/android/documentsui/ActionHandler.java
index 71cccf9ee..15124eb33 100644
--- a/src/com/android/documentsui/ActionHandler.java
+++ b/src/com/android/documentsui/ActionHandler.java
@@ -89,6 +89,8 @@ public interface ActionHandler {
*/
void startAuthentication(PendingIntent intent);
+ void requestQuietModeDisabled(RootInfo info, UserId userId);
+
void showAppDetails(ResolveInfo info, UserId userId);
void openRoot(RootInfo root);
diff --git a/src/com/android/documentsui/BaseActivity.java b/src/com/android/documentsui/BaseActivity.java
index d0ffe593c..0ddf001be 100644
--- a/src/com/android/documentsui/BaseActivity.java
+++ b/src/com/android/documentsui/BaseActivity.java
@@ -619,10 +619,10 @@ public abstract class BaseActivity
// Causes talkback to announce the activity's new title
String appName = getString(R.string.files_label);
- if (getTitle().toString().isEmpty()) {
+ if (getTitle() == null || getTitle().toString().isEmpty()) {
// First launch, TalkBack announces app name.
setTitle(String.format("%s. %s", appName, mState.stack.getTitle()));
- } else {
+ } else if (mState.stack.getTitle() != null) {
setTitle(mState.stack.getTitle());
}
diff --git a/src/com/android/documentsui/RequestQuietModeDisabledTask.java b/src/com/android/documentsui/RequestQuietModeDisabledTask.java
new file mode 100644
index 000000000..238e4f96c
--- /dev/null
+++ b/src/com/android/documentsui/RequestQuietModeDisabledTask.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2020 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;
+
+import static androidx.core.util.Preconditions.checkNotNull;
+
+import android.content.Context;
+import android.os.AsyncTask;
+
+import com.android.documentsui.base.UserId;
+
+import java.lang.ref.WeakReference;
+
+/**
+ * A task to request disabling quiet mode for a given user.
+ */
+class RequestQuietModeDisabledTask extends AsyncTask<Void, Void, Void> {
+
+ private final WeakReference<Context> mContextWeakReference;
+ private final UserId mUserId;
+
+ RequestQuietModeDisabledTask(Context context, UserId userId) {
+ mContextWeakReference = new WeakReference<>(checkNotNull(context));
+ mUserId = checkNotNull(userId);
+ }
+
+ @Override
+ protected Void doInBackground(Void... voids) {
+ Context context = mContextWeakReference.get();
+ if (context != null) {
+ mUserId.requestQuietModeDisabled(context);
+ }
+ return null;
+ }
+}
diff --git a/src/com/android/documentsui/dirlist/InflateMessageDocumentHolder.java b/src/com/android/documentsui/dirlist/InflateMessageDocumentHolder.java
index 9148345e6..4b1113675 100644
--- a/src/com/android/documentsui/dirlist/InflateMessageDocumentHolder.java
+++ b/src/com/android/documentsui/dirlist/InflateMessageDocumentHolder.java
@@ -22,6 +22,7 @@ import android.text.TextUtils;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
+import android.widget.ProgressBar;
import android.widget.TextView;
import com.android.documentsui.R;
@@ -47,11 +48,15 @@ final class InflateMessageDocumentHolder extends MessageHolder {
private View mContentView;
private View mCrossProfileView;
+ private View mCrossProfileContent;
+ private ProgressBar mCrossProfileProgress;
public InflateMessageDocumentHolder(Context context, ViewGroup parent) {
super(context, parent, R.layout.item_doc_inflated_message);
mContentView = itemView.findViewById(R.id.content);
mCrossProfileView = itemView.findViewById(R.id.cross_profile);
+ mCrossProfileContent = mCrossProfileView.findViewById(R.id.cross_profile_content);
+ mCrossProfileProgress = mCrossProfileView.findViewById(R.id.cross_profile_progress);
mContentMessage = mContentView.findViewById(R.id.message);
mContentImage = mContentView.findViewById(R.id.artwork);
@@ -76,7 +81,9 @@ final class InflateMessageDocumentHolder extends MessageHolder {
}
}
- private void onButtonClick(View button) {
+ private void onCrossProfileButtonClick(View button) {
+ mCrossProfileContent.setVisibility(View.GONE);
+ mCrossProfileProgress.setVisibility(View.VISIBLE);
mMessage.runCallback();
}
@@ -91,6 +98,9 @@ final class InflateMessageDocumentHolder extends MessageHolder {
private void bindCrossProfileMessageView() {
mContentView.setVisibility(View.GONE);
mCrossProfileView.setVisibility(View.VISIBLE);
+ mCrossProfileContent.setVisibility(View.VISIBLE);
+ mCrossProfileProgress.setVisibility(View.GONE);
+
mCrossProfileTitle.setText(mMessage.getTitleString());
if (!TextUtils.isEmpty(mMessage.getMessageString())) {
mCrossProfileMessage.setVisibility(View.VISIBLE);
@@ -102,7 +112,7 @@ final class InflateMessageDocumentHolder extends MessageHolder {
if (!TextUtils.isEmpty(mMessage.getButtonString())) {
mCrossProfileButton.setVisibility(View.VISIBLE);
mCrossProfileButton.setText(mMessage.getButtonString());
- mCrossProfileButton.setOnClickListener(this::onButtonClick);
+ mCrossProfileButton.setOnClickListener(this::onCrossProfileButtonClick);
} else {
mCrossProfileButton.setVisibility(View.GONE);
}
diff --git a/src/com/android/documentsui/dirlist/Message.java b/src/com/android/documentsui/dirlist/Message.java
index 4fc7c497f..b5074e4a1 100644
--- a/src/com/android/documentsui/dirlist/Message.java
+++ b/src/com/android/documentsui/dirlist/Message.java
@@ -21,7 +21,6 @@ import android.app.AuthenticationRequiredException;
import android.content.pm.PackageManager;
import android.content.res.Resources;
import android.graphics.drawable.Drawable;
-import android.os.AsyncTask;
import androidx.annotation.Nullable;
@@ -215,14 +214,8 @@ abstract class Message {
CharSequence buttonText = null;
if (mCanModifyQuietMode) {
buttonText = mEnv.getContext().getResources().getText(R.string.quiet_mode_button);
- mCallback = () ->
- new AsyncTask<Void, Void, Void>() {
- @Override
- protected Void doInBackground(Void... voids) {
- userId.requestQuietModeDisabled(mEnv.getContext());
- return null;
- }
- }.execute();
+ mCallback = () -> mEnv.getActionHandler().requestQuietModeDisabled(
+ mEnv.getDisplayState().stack.getRoot(), userId);
}
update(
mEnv.getContext().getResources().getText(R.string.quiet_mode_error_title),
diff --git a/tests/common/com/android/documentsui/testing/TestActionHandler.java b/tests/common/com/android/documentsui/testing/TestActionHandler.java
index f28234203..de7b266d0 100644
--- a/tests/common/com/android/documentsui/testing/TestActionHandler.java
+++ b/tests/common/com/android/documentsui/testing/TestActionHandler.java
@@ -24,6 +24,7 @@ import com.android.documentsui.AbstractActionHandler;
import com.android.documentsui.TestActivity;
import com.android.documentsui.base.DocumentInfo;
import com.android.documentsui.base.RootInfo;
+import com.android.documentsui.base.UserId;
import java.util.function.Consumer;
@@ -33,6 +34,7 @@ public class TestActionHandler extends AbstractActionHandler<TestActivity> {
public final TestEventHandler<ItemDetails<String>> open = new TestEventHandler<>();
public boolean mDeleteHappened;
+ public boolean mRequestDisablingQuietModeHappened;
public DocumentInfo nextRootDocument;
@@ -64,6 +66,11 @@ public class TestActionHandler extends AbstractActionHandler<TestActivity> {
}
@Override
+ public void requestQuietModeDisabled(RootInfo info, UserId userId) {
+ mRequestDisablingQuietModeHappened = true;
+ }
+
+ @Override
public void openRoot(RootInfo root) {
throw new UnsupportedOperationException();
}
diff --git a/tests/unit/com/android/documentsui/dirlist/InflateMessageDocumentHolderTest.java b/tests/unit/com/android/documentsui/dirlist/InflateMessageDocumentHolderTest.java
new file mode 100644
index 000000000..436e4fbca
--- /dev/null
+++ b/tests/unit/com/android/documentsui/dirlist/InflateMessageDocumentHolderTest.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright (C) 2020 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 static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.view.View;
+import android.widget.Button;
+
+import androidx.test.filters.SmallTest;
+import androidx.test.platform.app.InstrumentationRegistry;
+
+import com.android.documentsui.CrossProfileQuietModeException;
+import com.android.documentsui.Model;
+import com.android.documentsui.R;
+import com.android.documentsui.base.State;
+import com.android.documentsui.testing.TestActionHandler;
+import com.android.documentsui.testing.TestEnv;
+import com.android.documentsui.testing.TestProvidersAccess;
+
+import org.junit.Before;
+import org.junit.Test;
+
+@SmallTest
+public final class InflateMessageDocumentHolderTest {
+
+ private Context mContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
+ private Runnable mDefaultCallback = () -> {
+ };
+ private Message mInflateMessage;
+ private TestActionHandler mTestActionHandler = new TestActionHandler();
+ private InflateMessageDocumentHolder mHolder;
+
+ @Before
+ public void setUp() {
+ DocumentsAdapter.Environment env =
+ new TestEnvironment(mContext, TestEnv.create(), mTestActionHandler);
+ env.getDisplayState().action = State.ACTION_GET_CONTENT;
+ env.getDisplayState().canShareAcrossProfile = true;
+ env.getDisplayState().supportsCrossProfile = true;
+ mInflateMessage = new Message.InflateMessage(env, mDefaultCallback);
+ mContext.setTheme(R.style.DocumentsTheme);
+ mContext.getTheme().applyStyle(R.style.DocumentsDefaultTheme, /* force= */false);
+
+ mHolder = new InflateMessageDocumentHolder(mContext, /* parent= */null);
+ }
+
+ @Test
+ public void testClickingButtonShouldShowProgressBar() {
+ Model.Update error = new Model.Update(
+ new CrossProfileQuietModeException(TestProvidersAccess.OtherUser.USER_ID),
+ /* remoteActionsEnabled= */ true);
+ mInflateMessage.update(error);
+
+ mHolder.bind(mInflateMessage);
+
+ View content = mHolder.itemView.findViewById(R.id.content);
+ View crossProfile = mHolder.itemView.findViewById(R.id.cross_profile);
+ View crossProfileContent = mHolder.itemView.findViewById(R.id.cross_profile_content);
+ View progress = mHolder.itemView.findViewById(R.id.cross_profile_progress);
+ Button button = mHolder.itemView.findViewById(R.id.button);
+
+ assertThat(content.getVisibility()).isEqualTo(View.GONE);
+ assertThat(crossProfile.getVisibility()).isEqualTo(View.VISIBLE);
+ assertThat(crossProfileContent.getVisibility()).isEqualTo(View.VISIBLE);
+ assertThat(progress.getVisibility()).isEqualTo(View.GONE);
+
+ if (button.getVisibility() == View.VISIBLE) {
+ // The button is visible when docsUI has the permission to modify quiet mode.
+ assertThat(button.callOnClick()).isTrue();
+ assertThat(crossProfile.getVisibility()).isEqualTo(View.VISIBLE);
+ assertThat(crossProfileContent.getVisibility()).isEqualTo(View.GONE);
+ assertThat(progress.getVisibility()).isEqualTo(View.VISIBLE);
+ }
+ }
+}
diff --git a/tests/unit/com/android/documentsui/dirlist/MessageTest.java b/tests/unit/com/android/documentsui/dirlist/MessageTest.java
index 3eff20e7f..54dbbc501 100644
--- a/tests/unit/com/android/documentsui/dirlist/MessageTest.java
+++ b/tests/unit/com/android/documentsui/dirlist/MessageTest.java
@@ -19,12 +19,9 @@ package com.android.documentsui.dirlist;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.timeout;
-import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.content.Context;
-import android.os.UserHandle;
import android.os.UserManager;
import androidx.core.util.Preconditions;
@@ -53,16 +50,18 @@ public final class MessageTest {
private Runnable mDefaultCallback = () -> {
};
private UserManager mUserManager;
+ private TestActionHandler mTestActionHandler;
@Before
public void setUp() {
mContext = mock(Context.class);
mUserManager = UserManagers.create();
+ mTestActionHandler = new TestActionHandler();
when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
when(mContext.getResources()).thenReturn(
InstrumentationRegistry.getInstrumentation().getTargetContext().getResources());
DocumentsAdapter.Environment env =
- new TestEnvironment(mContext, TestEnv.create(), new TestActionHandler());
+ new TestEnvironment(mContext, TestEnv.create(), mTestActionHandler);
env.getDisplayState().action = State.ACTION_GET_CONTENT;
mInflateMessage = new Message.InflateMessage(env, mDefaultCallback);
}
@@ -100,7 +99,7 @@ public final class MessageTest {
mContext.getString(R.string.quiet_mode_button));
assertThat(mInflateMessage.mCallback).isNotNull();
mInflateMessage.mCallback.run();
- verify(mUserManager, timeout(3000))
- .requestQuietModeEnabled(false, UserHandle.of(mUserId.getIdentifier()));
+
+ assertThat(mTestActionHandler.mRequestDisablingQuietModeHappened).isTrue();
}
}