diff options
76 files changed, 189 insertions, 260 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index f189f588e..edbe841fb 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -184,7 +184,8 @@ </intent-filter> </provider> - <receiver android:name=".PackageReceiver"> + <receiver android:name=".PackageReceiver" + android:exported="true"> <intent-filter> <action android:name="android.intent.action.PACKAGE_FULLY_REMOVED" /> <action android:name="android.intent.action.PACKAGE_DATA_CLEARED" /> @@ -192,13 +193,15 @@ </intent-filter> </receiver> - <receiver android:name=".roots.BootReceiver" android:enabled="false"> + <receiver android:name=".roots.BootReceiver" android:enabled="false" + android:exported="true"> <intent-filter> <action android:name="android.intent.action.BOOT_COMPLETED" /> </intent-filter> </receiver> - <receiver android:name=".PreBootReceiver"> + <receiver android:name=".PreBootReceiver" + android:exported="true"> <intent-filter> <action android:name="android.intent.action.PRE_BOOT_COMPLETED" /> </intent-filter> @@ -216,6 +219,7 @@ <activity android:name=".selection.demo.SelectionDemoActivity" android:label="Selection Demo" + android:exported="true" android:theme="@style/DocumentsTheme"> <intent-filter> <action android:name="android.intent.action.MAIN" /> diff --git a/MODULE_LICENSE_APACHE2 b/MODULE_LICENSE_APACHE2 deleted file mode 100644 index e69de29bb..000000000 --- a/MODULE_LICENSE_APACHE2 +++ /dev/null diff --git a/res/layout/drawer_layout.xml b/res/layout/drawer_layout.xml index 0b2a81d72..74e219cbc 100644 --- a/res/layout/drawer_layout.xml +++ b/res/layout/drawer_layout.xml @@ -58,8 +58,8 @@ android:layout_width="match_parent" android:layout_height="match_parent" /> - <!-- Drawer edge is a dummy view used to capture hovering event - on view edge to open the drawer. (b/28345294) --> + <!-- Drawer edge is a placeholder view used to capture hovering + event on view edge to open the drawer. (b/28345294) --> <View android:id="@+id/drawer_edge" android:background="@android:color/transparent" diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml index 357a4e16e..1e8e1b559 100644 --- a/res/values-ar/strings.xml +++ b/res/values-ar/strings.xml @@ -366,8 +366,6 @@ <string name="work_tab" msgid="7265359366883747413">"للعمل"</string> <string name="a11y_work" msgid="7504431382825242153">"عمل"</string> <string name="drag_from_another_app" msgid="8310249276199969905">"لا يمكنك نقل الملفات من تطبيق آخر."</string> - <!-- no translation found for grid_mode_showing (2803166871485028508) --> - <skip /> - <!-- no translation found for list_mode_showing (1225413902295895166) --> - <skip /> + <string name="grid_mode_showing" msgid="2803166871485028508">"يتم العرض في وضع الشبكة."</string> + <string name="list_mode_showing" msgid="1225413902295895166">"يتم العرض في وضع القائمة."</string> </resources> diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml index 794848e5a..9c2be4ee3 100644 --- a/res/values-az/strings.xml +++ b/res/values-az/strings.xml @@ -278,8 +278,6 @@ <string name="work_tab" msgid="7265359366883747413">"İş"</string> <string name="a11y_work" msgid="7504431382825242153">"İş"</string> <string name="drag_from_another_app" msgid="8310249276199969905">"Başqa tətbiqdən faylları köçürə bilməzsiniz."</string> - <!-- no translation found for grid_mode_showing (2803166871485028508) --> - <skip /> - <!-- no translation found for list_mode_showing (1225413902295895166) --> - <skip /> + <string name="grid_mode_showing" msgid="2803166871485028508">"Tor rejimində göstərilir."</string> + <string name="list_mode_showing" msgid="1225413902295895166">"Siyahı rejimində göstərilir."</string> </resources> diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml index f960858fa..abdf07386 100644 --- a/res/values-b+sr+Latn/strings.xml +++ b/res/values-b+sr+Latn/strings.xml @@ -300,8 +300,6 @@ <string name="work_tab" msgid="7265359366883747413">"Posao"</string> <string name="a11y_work" msgid="7504431382825242153">"Posao"</string> <string name="drag_from_another_app" msgid="8310249276199969905">"Ne možete da premeštate datoteke iz druge aplikacije."</string> - <!-- no translation found for grid_mode_showing (2803166871485028508) --> - <skip /> - <!-- no translation found for list_mode_showing (1225413902295895166) --> - <skip /> + <string name="grid_mode_showing" msgid="2803166871485028508">"Prikazuje se u režimu mreže."</string> + <string name="list_mode_showing" msgid="1225413902295895166">"Prikazuje se u režimu liste."</string> </resources> diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml index 5e97f2a14..6372a2aab 100644 --- a/res/values-be/strings.xml +++ b/res/values-be/strings.xml @@ -322,8 +322,6 @@ <string name="work_tab" msgid="7265359366883747413">"Працоўны"</string> <string name="a11y_work" msgid="7504431382825242153">"Працоўны"</string> <string name="drag_from_another_app" msgid="8310249276199969905">"Вы не можаце перамяшчаць файлы з іншай праграмы."</string> - <!-- no translation found for grid_mode_showing (2803166871485028508) --> - <skip /> - <!-- no translation found for list_mode_showing (1225413902295895166) --> - <skip /> + <string name="grid_mode_showing" msgid="2803166871485028508">"Паказ у рэжыме табліцы."</string> + <string name="list_mode_showing" msgid="1225413902295895166">"Паказ у рэжыме спіса."</string> </resources> diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml index 77c91d338..63076a20d 100644 --- a/res/values-bn/strings.xml +++ b/res/values-bn/strings.xml @@ -278,8 +278,6 @@ <string name="work_tab" msgid="7265359366883747413">"অফিস"</string> <string name="a11y_work" msgid="7504431382825242153">"অফিসের প্রোফাইল"</string> <string name="drag_from_another_app" msgid="8310249276199969905">"অন্য অ্যাপ থেকে ফাইল সরাতে পারবেন না।"</string> - <!-- no translation found for grid_mode_showing (2803166871485028508) --> - <skip /> - <!-- no translation found for list_mode_showing (1225413902295895166) --> - <skip /> + <string name="grid_mode_showing" msgid="2803166871485028508">"গ্রিড মোডে দেখানো হচ্ছে।"</string> + <string name="list_mode_showing" msgid="1225413902295895166">"তালিকা মোডে দেখানো হচ্ছে।"</string> </resources> diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml index e35d1f4fb..47db1018c 100644 --- a/res/values-bs/strings.xml +++ b/res/values-bs/strings.xml @@ -300,8 +300,6 @@ <string name="work_tab" msgid="7265359366883747413">"Poslovno"</string> <string name="a11y_work" msgid="7504431382825242153">"Posao"</string> <string name="drag_from_another_app" msgid="8310249276199969905">"Ne možete premjestiti fajlove iz druge aplikacije."</string> - <!-- no translation found for grid_mode_showing (2803166871485028508) --> - <skip /> - <!-- no translation found for list_mode_showing (1225413902295895166) --> - <skip /> + <string name="grid_mode_showing" msgid="2803166871485028508">"Prikazivanje u vidu mreže."</string> + <string name="list_mode_showing" msgid="1225413902295895166">"Prikazivanje u vidu liste."</string> </resources> diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 3fc6a4c4a..de074682a 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -278,8 +278,6 @@ <string name="work_tab" msgid="7265359366883747413">"Geschäftlich"</string> <string name="a11y_work" msgid="7504431382825242153">"Aus Arbeitsprofil"</string> <string name="drag_from_another_app" msgid="8310249276199969905">"Du kannst keine Dateien aus einer anderen App verschieben."</string> - <!-- no translation found for grid_mode_showing (2803166871485028508) --> - <skip /> - <!-- no translation found for list_mode_showing (1225413902295895166) --> - <skip /> + <string name="grid_mode_showing" msgid="2803166871485028508">"Wird im Rastermodus angezeigt."</string> + <string name="list_mode_showing" msgid="1225413902295895166">"Wird im Listenmodus angezeigt."</string> </resources> diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml index 551e1124e..efd809823 100644 --- a/res/values-et/strings.xml +++ b/res/values-et/strings.xml @@ -278,8 +278,6 @@ <string name="work_tab" msgid="7265359366883747413">"Töö"</string> <string name="a11y_work" msgid="7504431382825242153">"Töö"</string> <string name="drag_from_another_app" msgid="8310249276199969905">"Te ei saa faile teisest rakendusest teisaldada."</string> - <!-- no translation found for grid_mode_showing (2803166871485028508) --> - <skip /> - <!-- no translation found for list_mode_showing (1225413902295895166) --> - <skip /> + <string name="grid_mode_showing" msgid="2803166871485028508">"Kuvatud ruudustikuvaates."</string> + <string name="list_mode_showing" msgid="1225413902295895166">"Kuvatud loendivaates."</string> </resources> diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml index f48cf4bc4..b13de15a5 100644 --- a/res/values-eu/strings.xml +++ b/res/values-eu/strings.xml @@ -278,8 +278,6 @@ <string name="work_tab" msgid="7265359366883747413">"Lanekoa"</string> <string name="a11y_work" msgid="7504431382825242153">"Lana"</string> <string name="drag_from_another_app" msgid="8310249276199969905">"Ezin dituzu mugitu beste aplikazio batzuetako fitxategiak."</string> - <!-- no translation found for grid_mode_showing (2803166871485028508) --> - <skip /> - <!-- no translation found for list_mode_showing (1225413902295895166) --> - <skip /> + <string name="grid_mode_showing" msgid="2803166871485028508">"Sareta moduan ikusgai."</string> + <string name="list_mode_showing" msgid="1225413902295895166">"Zerrenda moduan ikusgai."</string> </resources> diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml index 59d90a18a..98f805ab6 100644 --- a/res/values-fi/strings.xml +++ b/res/values-fi/strings.xml @@ -278,8 +278,6 @@ <string name="work_tab" msgid="7265359366883747413">"Työ"</string> <string name="a11y_work" msgid="7504431382825242153">"Työ"</string> <string name="drag_from_another_app" msgid="8310249276199969905">"Et voi siirtää tiedostoja toisesta sovelluksesta."</string> - <!-- no translation found for grid_mode_showing (2803166871485028508) --> - <skip /> - <!-- no translation found for list_mode_showing (1225413902295895166) --> - <skip /> + <string name="grid_mode_showing" msgid="2803166871485028508">"Näytetään ruudukkotilassa."</string> + <string name="list_mode_showing" msgid="1225413902295895166">"Näytetään luettelotilassa."</string> </resources> diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml index 5f8bea7cc..d46c6bcf0 100644 --- a/res/values-fr-rCA/strings.xml +++ b/res/values-fr-rCA/strings.xml @@ -278,8 +278,6 @@ <string name="work_tab" msgid="7265359366883747413">"Professionnel"</string> <string name="a11y_work" msgid="7504431382825242153">"Travail"</string> <string name="drag_from_another_app" msgid="8310249276199969905">"Vous ne pouvez pas déplacer de fichiers d\'une autre application."</string> - <!-- no translation found for grid_mode_showing (2803166871485028508) --> - <skip /> - <!-- no translation found for list_mode_showing (1225413902295895166) --> - <skip /> + <string name="grid_mode_showing" msgid="2803166871485028508">"Affichage en mode grille."</string> + <string name="list_mode_showing" msgid="1225413902295895166">"Affichage en mode liste."</string> </resources> diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 4f589c42a..9705244c5 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -278,8 +278,6 @@ <string name="work_tab" msgid="7265359366883747413">"Professionnel"</string> <string name="a11y_work" msgid="7504431382825242153">"Travail"</string> <string name="drag_from_another_app" msgid="8310249276199969905">"Vous ne pouvez pas déplacer de fichiers depuis une autre application."</string> - <!-- no translation found for grid_mode_showing (2803166871485028508) --> - <skip /> - <!-- no translation found for list_mode_showing (1225413902295895166) --> - <skip /> + <string name="grid_mode_showing" msgid="2803166871485028508">"Affichage en mode grille."</string> + <string name="list_mode_showing" msgid="1225413902295895166">"Affichage en mode liste."</string> </resources> diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml index 2f2b29087..d026d423a 100644 --- a/res/values-gl/strings.xml +++ b/res/values-gl/strings.xml @@ -278,8 +278,6 @@ <string name="work_tab" msgid="7265359366883747413">"Traballo"</string> <string name="a11y_work" msgid="7504431382825242153">"Traballo"</string> <string name="drag_from_another_app" msgid="8310249276199969905">"Non se poden mover ficheiros desde outra aplicación."</string> - <!-- no translation found for grid_mode_showing (2803166871485028508) --> - <skip /> - <!-- no translation found for list_mode_showing (1225413902295895166) --> - <skip /> + <string name="grid_mode_showing" msgid="2803166871485028508">"Mostrando modo de grade."</string> + <string name="list_mode_showing" msgid="1225413902295895166">"Mostrando modo de lista."</string> </resources> diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml index 1284ff079..568ba290e 100644 --- a/res/values-gu/strings.xml +++ b/res/values-gu/strings.xml @@ -278,8 +278,6 @@ <string name="work_tab" msgid="7265359366883747413">"ઑફિસ"</string> <string name="a11y_work" msgid="7504431382825242153">"ઑફિસ"</string> <string name="drag_from_another_app" msgid="8310249276199969905">"તમે કોઈ અન્ય ઍપમાંથી ફાઇલો ખસેડી શકતાં નથી."</string> - <!-- no translation found for grid_mode_showing (2803166871485028508) --> - <skip /> - <!-- no translation found for list_mode_showing (1225413902295895166) --> - <skip /> + <string name="grid_mode_showing" msgid="2803166871485028508">"ગ્રિડ મોડમાં બતાવી રહ્યાં છીએ."</string> + <string name="list_mode_showing" msgid="1225413902295895166">"સૂચિ મોડમાં બતાવી રહ્યાં છીએ."</string> </resources> diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml index cc7e6a70f..87b143987 100644 --- a/res/values-hr/strings.xml +++ b/res/values-hr/strings.xml @@ -300,8 +300,6 @@ <string name="work_tab" msgid="7265359366883747413">"Posao"</string> <string name="a11y_work" msgid="7504431382825242153">"Poslovni"</string> <string name="drag_from_another_app" msgid="8310249276199969905">"Ne možete premjestiti datoteke iz druge aplikacije."</string> - <!-- no translation found for grid_mode_showing (2803166871485028508) --> - <skip /> - <!-- no translation found for list_mode_showing (1225413902295895166) --> - <skip /> + <string name="grid_mode_showing" msgid="2803166871485028508">"Prikazivanje u načinu rešetke."</string> + <string name="list_mode_showing" msgid="1225413902295895166">"Prikazivanje u načinu popisa."</string> </resources> diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml index f09246cd3..45e82d1df 100644 --- a/res/values-hu/strings.xml +++ b/res/values-hu/strings.xml @@ -278,8 +278,6 @@ <string name="work_tab" msgid="7265359366883747413">"Munkahelyi"</string> <string name="a11y_work" msgid="7504431382825242153">"Munka"</string> <string name="drag_from_another_app" msgid="8310249276199969905">"Nem lehet áthelyezni fájlokat más alkalmazásból."</string> - <!-- no translation found for grid_mode_showing (2803166871485028508) --> - <skip /> - <!-- no translation found for list_mode_showing (1225413902295895166) --> - <skip /> + <string name="grid_mode_showing" msgid="2803166871485028508">"Megjelenítés rácsnézetben."</string> + <string name="list_mode_showing" msgid="1225413902295895166">"Megjelenítés listanézetben."</string> </resources> diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml index 35a5c1cfd..8fc046aeb 100644 --- a/res/values-in/strings.xml +++ b/res/values-in/strings.xml @@ -278,8 +278,6 @@ <string name="work_tab" msgid="7265359366883747413">"Kerja"</string> <string name="a11y_work" msgid="7504431382825242153">"Kerja"</string> <string name="drag_from_another_app" msgid="8310249276199969905">"Anda tidak dapat memindahkan file ke aplikasi lain."</string> - <!-- no translation found for grid_mode_showing (2803166871485028508) --> - <skip /> - <!-- no translation found for list_mode_showing (1225413902295895166) --> - <skip /> + <string name="grid_mode_showing" msgid="2803166871485028508">"Menampilkan dalam mode petak."</string> + <string name="list_mode_showing" msgid="1225413902295895166">"Menampilkan dalam mode daftar."</string> </resources> diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml index 053b1a7b9..9ed4fa6b4 100644 --- a/res/values-ka/strings.xml +++ b/res/values-ka/strings.xml @@ -278,8 +278,6 @@ <string name="work_tab" msgid="7265359366883747413">"სამსახური"</string> <string name="a11y_work" msgid="7504431382825242153">"სამსახური"</string> <string name="drag_from_another_app" msgid="8310249276199969905">"ფაილების სხვა აპიდან გადმოტანა შეუძლებელია."</string> - <!-- no translation found for grid_mode_showing (2803166871485028508) --> - <skip /> - <!-- no translation found for list_mode_showing (1225413902295895166) --> - <skip /> + <string name="grid_mode_showing" msgid="2803166871485028508">"ნაჩვენებია ბადის რეჟიმში."</string> + <string name="list_mode_showing" msgid="1225413902295895166">"ნაჩვენებია სიის რეჟიმში."</string> </resources> diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml index eb198abe8..2a6bcc3c5 100644 --- a/res/values-kk/strings.xml +++ b/res/values-kk/strings.xml @@ -278,8 +278,6 @@ <string name="work_tab" msgid="7265359366883747413">"Жұмыс"</string> <string name="a11y_work" msgid="7504431382825242153">"Жұмыс"</string> <string name="drag_from_another_app" msgid="8310249276199969905">"Файлдарды басқа қолданбадан тасымалдай алмайсыз."</string> - <!-- no translation found for grid_mode_showing (2803166871485028508) --> - <skip /> - <!-- no translation found for list_mode_showing (1225413902295895166) --> - <skip /> + <string name="grid_mode_showing" msgid="2803166871485028508">"Тор режимінде көрсетіледі."</string> + <string name="list_mode_showing" msgid="1225413902295895166">"Тізім режимінде көрсетіледі."</string> </resources> diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml index 8eb647c60..2958418b2 100644 --- a/res/values-km/strings.xml +++ b/res/values-km/strings.xml @@ -278,8 +278,6 @@ <string name="work_tab" msgid="7265359366883747413">"ការងារ"</string> <string name="a11y_work" msgid="7504431382825242153">"ការងារ"</string> <string name="drag_from_another_app" msgid="8310249276199969905">"អ្នកមិនអាចផ្លាស់ទីឯកសារពីកម្មវិធីផ្សេងទៀតបានទេ។"</string> - <!-- no translation found for grid_mode_showing (2803166871485028508) --> - <skip /> - <!-- no translation found for list_mode_showing (1225413902295895166) --> - <skip /> + <string name="grid_mode_showing" msgid="2803166871485028508">"បង្ហាញក្នុងមុខងារក្រឡា។"</string> + <string name="list_mode_showing" msgid="1225413902295895166">"បង្ហាញក្នុងមុខងារបញ្ជី។"</string> </resources> diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml index 894bdfc25..cd19bc47f 100644 --- a/res/values-kn/strings.xml +++ b/res/values-kn/strings.xml @@ -278,8 +278,6 @@ <string name="work_tab" msgid="7265359366883747413">"ಉದ್ಯೋಗ"</string> <string name="a11y_work" msgid="7504431382825242153">"ಉದ್ಯೋಗ"</string> <string name="drag_from_another_app" msgid="8310249276199969905">"ನೀವು ಬೇರೊಂದು ಆ್ಯಪ್ನಿಂದ ಫೈಲ್ಗಳನ್ನು ಸರಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."</string> - <!-- no translation found for grid_mode_showing (2803166871485028508) --> - <skip /> - <!-- no translation found for list_mode_showing (1225413902295895166) --> - <skip /> + <string name="grid_mode_showing" msgid="2803166871485028508">"ಗ್ರಿಡ್ ಮೋಡ್ನಲ್ಲಿ ತೋರಿಸಲಾಗುತ್ತಿದೆ."</string> + <string name="list_mode_showing" msgid="1225413902295895166">"ಪಟ್ಟಿ ಮೋಡ್ನಲ್ಲಿ ತೋರಿಸಲಾಗುತ್ತಿದೆ."</string> </resources> diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index 967a79cc8..7c392ea21 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -278,8 +278,6 @@ <string name="work_tab" msgid="7265359366883747413">"직장"</string> <string name="a11y_work" msgid="7504431382825242153">"직장"</string> <string name="drag_from_another_app" msgid="8310249276199969905">"파일을 다른 앱에서 이동할 수 없습니다."</string> - <!-- no translation found for grid_mode_showing (2803166871485028508) --> - <skip /> - <!-- no translation found for list_mode_showing (1225413902295895166) --> - <skip /> + <string name="grid_mode_showing" msgid="2803166871485028508">"그리드 모드로 표시 중입니다."</string> + <string name="list_mode_showing" msgid="1225413902295895166">"목록 모드로 표시 중입니다."</string> </resources> diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml index 06ac37b13..7186a64d7 100644 --- a/res/values-ky/strings.xml +++ b/res/values-ky/strings.xml @@ -278,8 +278,6 @@ <string name="work_tab" msgid="7265359366883747413">"Жумуш"</string> <string name="a11y_work" msgid="7504431382825242153">"Жумуш"</string> <string name="drag_from_another_app" msgid="8310249276199969905">"Башка колдонмодогу файлдарды жылдырууга болбойт."</string> - <!-- no translation found for grid_mode_showing (2803166871485028508) --> - <skip /> - <!-- no translation found for list_mode_showing (1225413902295895166) --> - <skip /> + <string name="grid_mode_showing" msgid="2803166871485028508">"Торчо режиминде көрсөтүлүүдө."</string> + <string name="list_mode_showing" msgid="1225413902295895166">"Тизме режиминде көрсөтүлүүдө."</string> </resources> diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml index efae73ace..1de867a76 100644 --- a/res/values-lt/strings.xml +++ b/res/values-lt/strings.xml @@ -322,8 +322,6 @@ <string name="work_tab" msgid="7265359366883747413">"Darbo"</string> <string name="a11y_work" msgid="7504431382825242153">"Darbo"</string> <string name="drag_from_another_app" msgid="8310249276199969905">"Negalite perkelti failų iš kitos programos."</string> - <!-- no translation found for grid_mode_showing (2803166871485028508) --> - <skip /> - <!-- no translation found for list_mode_showing (1225413902295895166) --> - <skip /> + <string name="grid_mode_showing" msgid="2803166871485028508">"Rodoma tinklelio režimu."</string> + <string name="list_mode_showing" msgid="1225413902295895166">"Rodoma sąrašo režimu."</string> </resources> diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml index 1d399adf9..0f0cfb93a 100644 --- a/res/values-lv/strings.xml +++ b/res/values-lv/strings.xml @@ -300,8 +300,6 @@ <string name="work_tab" msgid="7265359366883747413">"Darba profils"</string> <string name="a11y_work" msgid="7504431382825242153">"Darbs"</string> <string name="drag_from_another_app" msgid="8310249276199969905">"Jūs nevarat pārvietot failus no citas lietotnes."</string> - <!-- no translation found for grid_mode_showing (2803166871485028508) --> - <skip /> - <!-- no translation found for list_mode_showing (1225413902295895166) --> - <skip /> + <string name="grid_mode_showing" msgid="2803166871485028508">"Tiek attēlots režģa režīms."</string> + <string name="list_mode_showing" msgid="1225413902295895166">"Tiek attēlots saraksta režīms."</string> </resources> diff --git a/res/values-mn/inspector_strings.xml b/res/values-mn/inspector_strings.xml index 625c31a07..50aa68b4d 100644 --- a/res/values-mn/inspector_strings.xml +++ b/res/values-mn/inspector_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="inspector_title" msgid="1924760928091740238">"Мэдээлэл"</string> - <string name="inspector_load_error" msgid="7522190243413249291">"Файлын мэдээллийг ачааллаж чадсангүй"</string> + <string name="inspector_load_error" msgid="7522190243413249291">"Файлын мэдээллийг ачаалж чадсангүй"</string> <string name="inspector_debug_section" msgid="2576052661505700421">"Дебаг хийх мэдээлэл (зөвхөн хөгжүүлэгчид)"</string> <string name="inspector_debug_metadata_section" msgid="5875140675600744846">"RAW мета өгөгдөл: <xliff:g id="METADATATYPE">%1$s</xliff:g>"</string> <string name="inspector_metadata_section" msgid="6077622515328240575">"Медианы дэлгэрэнгүй"</string> diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml index 555d2f7a9..7f776a2da 100644 --- a/res/values-ms/strings.xml +++ b/res/values-ms/strings.xml @@ -278,8 +278,6 @@ <string name="work_tab" msgid="7265359366883747413">"Kerja"</string> <string name="a11y_work" msgid="7504431382825242153">"Kerja"</string> <string name="drag_from_another_app" msgid="8310249276199969905">"Anda tidak boleh mengalihkan fail daripada apl lain."</string> - <!-- no translation found for grid_mode_showing (2803166871485028508) --> - <skip /> - <!-- no translation found for list_mode_showing (1225413902295895166) --> - <skip /> + <string name="grid_mode_showing" msgid="2803166871485028508">"Ditunjukkan dalam mod grid."</string> + <string name="list_mode_showing" msgid="1225413902295895166">"Ditunjukkan dalam mod senarai."</string> </resources> diff --git a/res/values-ne/inspector_strings.xml b/res/values-ne/inspector_strings.xml index e9780af77..c9acb5841 100644 --- a/res/values-ne/inspector_strings.xml +++ b/res/values-ne/inspector_strings.xml @@ -27,7 +27,7 @@ <string name="handler_app_unknown" msgid="5911661530593229287">"अज्ञात"</string> <string name="metadata_dimensions" msgid="6112907724016659801">"उचाइ तथा चौडाइ"</string> <string name="metadata_dimensions_format" msgid="6138765871412005962">"<xliff:g id="WIDTH">%1$d</xliff:g> x <xliff:g id="HEIGHT">%2$d</xliff:g> - <xliff:g id="MEGAPIXELS">%3$,.1f</xliff:g> एम. पि."</string> - <string name="metadata_coordinates" msgid="6897383227370702734">"तस्बिर खिचेको स्थानका भौगोलिक स्थितिहरू"</string> + <string name="metadata_coordinates" msgid="6897383227370702734">"फोटो खिचेको स्थानका भौगोलिक स्थितिहरू"</string> <string name="metadata_coordinates_format" msgid="1402724596764547761">"<xliff:g id="LATITUDE">%1$,.3f</xliff:g>, <xliff:g id="LONGITUDE">%2$,.3f</xliff:g>"</string> <string name="metadata_altitude" msgid="8063792127436794294">"उचाइ"</string> <string name="metadata_camera" msgid="2363009732801281319">"क्यामेरा"</string> @@ -35,7 +35,7 @@ <string name="metadata_aperture" msgid="6538741952698935357">"अपार्चर"</string> <string name="metadata_shutter_speed" msgid="8204739885103326131">"सटरको गति"</string> <string name="metadata_duration" msgid="3115494422055472715">"अवधि"</string> - <string name="metadata_date_time" msgid="1090351199248114406">"तस्बिर खिचेको समय"</string> + <string name="metadata_date_time" msgid="1090351199248114406">"फोटो खिचेको समय"</string> <string name="metadata_focal_length" msgid="3440735161407699893">"फोकल लम्बाइ"</string> <string name="metadata_focal_format" msgid="8542211707962355623">"<xliff:g id="LENGTH">%1$.2f </xliff:g> मि. मि."</string> <string name="metadata_iso_speed_ratings" msgid="1699781252899759058">"ISO बराबर"</string> diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml index 6286706fa..99d689829 100644 --- a/res/values-ne/strings.xml +++ b/res/values-ne/strings.xml @@ -278,8 +278,6 @@ <string name="work_tab" msgid="7265359366883747413">"काम"</string> <string name="a11y_work" msgid="7504431382825242153">"काम"</string> <string name="drag_from_another_app" msgid="8310249276199969905">"तपाईं अर्को एपमा रहेका फाइलहरू सार्न सक्नुहुन्न।"</string> - <!-- no translation found for grid_mode_showing (2803166871485028508) --> - <skip /> - <!-- no translation found for list_mode_showing (1225413902295895166) --> - <skip /> + <string name="grid_mode_showing" msgid="2803166871485028508">"ग्रिड मोडमा देखाइँदै।"</string> + <string name="list_mode_showing" msgid="1225413902295895166">"सूची मोडमा देखाइँदै।"</string> </resources> diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml index 1466767af..3252371d8 100644 --- a/res/values-pa/strings.xml +++ b/res/values-pa/strings.xml @@ -278,8 +278,6 @@ <string name="work_tab" msgid="7265359366883747413">"ਕਾਰਜ-ਸਥਾਨ"</string> <string name="a11y_work" msgid="7504431382825242153">"ਕੰਮ"</string> <string name="drag_from_another_app" msgid="8310249276199969905">"ਤੁਸੀਂ ਕਿਸੇ ਹੋਰ ਐਪ ਤੋਂ ਫ਼ਾਈਲਾਂ ਨਹੀਂ ਲਿਜਾ ਸਕਦੇ।"</string> - <!-- no translation found for grid_mode_showing (2803166871485028508) --> - <skip /> - <!-- no translation found for list_mode_showing (1225413902295895166) --> - <skip /> + <string name="grid_mode_showing" msgid="2803166871485028508">"ਗ੍ਰਿਡ ਮੋਡ ਵਿੱਚ ਦਿਖਾਈਆਂ ਜਾ ਰਹੀਆਂ ਹਨ"</string> + <string name="list_mode_showing" msgid="1225413902295895166">"ਸੂਚੀ ਮੋਡ ਵਿੱਚ ਦਿਖਾਈਆਂ ਜਾ ਰਹੀਆਂ ਹਨ।"</string> </resources> diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index 28f73a43c..ae8480276 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -322,8 +322,6 @@ <string name="work_tab" msgid="7265359366883747413">"Służbowe"</string> <string name="a11y_work" msgid="7504431382825242153">"Praca"</string> <string name="drag_from_another_app" msgid="8310249276199969905">"Nie można przenosić plików z innej aplikacji."</string> - <!-- no translation found for grid_mode_showing (2803166871485028508) --> - <skip /> - <!-- no translation found for list_mode_showing (1225413902295895166) --> - <skip /> + <string name="grid_mode_showing" msgid="2803166871485028508">"Wyświetlanie w trybie siatki."</string> + <string name="list_mode_showing" msgid="1225413902295895166">"Wyświetlanie w trybie listy."</string> </resources> diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml index 9f65c3d42..c72139a34 100644 --- a/res/values-ro/strings.xml +++ b/res/values-ro/strings.xml @@ -300,8 +300,6 @@ <string name="work_tab" msgid="7265359366883747413">"Serviciu"</string> <string name="a11y_work" msgid="7504431382825242153">"Serviciu"</string> <string name="drag_from_another_app" msgid="8310249276199969905">"Nu puteți muta fișiere din altă aplicație."</string> - <!-- no translation found for grid_mode_showing (2803166871485028508) --> - <skip /> - <!-- no translation found for list_mode_showing (1225413902295895166) --> - <skip /> + <string name="grid_mode_showing" msgid="2803166871485028508">"Se afișează în modul grilă."</string> + <string name="list_mode_showing" msgid="1225413902295895166">"Se afișează în modul listă."</string> </resources> diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index 4f4c4bc35..4caa70f27 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -322,8 +322,6 @@ <string name="work_tab" msgid="7265359366883747413">"Рабочее"</string> <string name="a11y_work" msgid="7504431382825242153">"Работа"</string> <string name="drag_from_another_app" msgid="8310249276199969905">"Перемещать файлы из другого приложения нельзя."</string> - <!-- no translation found for grid_mode_showing (2803166871485028508) --> - <skip /> - <!-- no translation found for list_mode_showing (1225413902295895166) --> - <skip /> + <string name="grid_mode_showing" msgid="2803166871485028508">"Показано в виде таблицы."</string> + <string name="list_mode_showing" msgid="1225413902295895166">"Показано в виде списка."</string> </resources> diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml index 6c4107942..1077de505 100644 --- a/res/values-sk/strings.xml +++ b/res/values-sk/strings.xml @@ -322,8 +322,6 @@ <string name="work_tab" msgid="7265359366883747413">"Práca"</string> <string name="a11y_work" msgid="7504431382825242153">"Práca"</string> <string name="drag_from_another_app" msgid="8310249276199969905">"Nemôžete presúvať súbory z inej aplikácie."</string> - <!-- no translation found for grid_mode_showing (2803166871485028508) --> - <skip /> - <!-- no translation found for list_mode_showing (1225413902295895166) --> - <skip /> + <string name="grid_mode_showing" msgid="2803166871485028508">"Zobrazované v režime mriežky."</string> + <string name="list_mode_showing" msgid="1225413902295895166">"Zobrazované v režime zoznamu."</string> </resources> diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml index ae1e7424b..f326b835d 100644 --- a/res/values-sq/strings.xml +++ b/res/values-sq/strings.xml @@ -278,8 +278,6 @@ <string name="work_tab" msgid="7265359366883747413">"Puna"</string> <string name="a11y_work" msgid="7504431382825242153">"Puna"</string> <string name="drag_from_another_app" msgid="8310249276199969905">"Nuk mund t\'i zhvendosësh skedarët nga një aplikacion tjetër."</string> - <!-- no translation found for grid_mode_showing (2803166871485028508) --> - <skip /> - <!-- no translation found for list_mode_showing (1225413902295895166) --> - <skip /> + <string name="grid_mode_showing" msgid="2803166871485028508">"Po shfaq në modalitetin \"rrjetë\"."</string> + <string name="list_mode_showing" msgid="1225413902295895166">"Po shfaq në modalitetin \"listë\"."</string> </resources> diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml index 59dc68365..bebe573d4 100644 --- a/res/values-sr/strings.xml +++ b/res/values-sr/strings.xml @@ -300,8 +300,6 @@ <string name="work_tab" msgid="7265359366883747413">"Посао"</string> <string name="a11y_work" msgid="7504431382825242153">"Посао"</string> <string name="drag_from_another_app" msgid="8310249276199969905">"Не можете да премештате датотеке из друге апликације."</string> - <!-- no translation found for grid_mode_showing (2803166871485028508) --> - <skip /> - <!-- no translation found for list_mode_showing (1225413902295895166) --> - <skip /> + <string name="grid_mode_showing" msgid="2803166871485028508">"Приказује се у режиму мреже."</string> + <string name="list_mode_showing" msgid="1225413902295895166">"Приказује се у режиму листе."</string> </resources> diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml index 91f9188dc..7c854a4c4 100644 --- a/res/values-th/strings.xml +++ b/res/values-th/strings.xml @@ -278,8 +278,6 @@ <string name="work_tab" msgid="7265359366883747413">"งาน"</string> <string name="a11y_work" msgid="7504431382825242153">"งาน"</string> <string name="drag_from_another_app" msgid="8310249276199969905">"คุณย้ายไฟล์จากแอปอื่นไม่ได้"</string> - <!-- no translation found for grid_mode_showing (2803166871485028508) --> - <skip /> - <!-- no translation found for list_mode_showing (1225413902295895166) --> - <skip /> + <string name="grid_mode_showing" msgid="2803166871485028508">"กำลังแสดงในโหมดตารางกริด"</string> + <string name="list_mode_showing" msgid="1225413902295895166">"กำลังแสดงในโหมดรายการ"</string> </resources> diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml index 19581be2e..251408ebd 100644 --- a/res/values-tr/strings.xml +++ b/res/values-tr/strings.xml @@ -278,8 +278,6 @@ <string name="work_tab" msgid="7265359366883747413">"İş"</string> <string name="a11y_work" msgid="7504431382825242153">"İş"</string> <string name="drag_from_another_app" msgid="8310249276199969905">"Başka bir uygulamadan dosya taşıyamazsınız."</string> - <!-- no translation found for grid_mode_showing (2803166871485028508) --> - <skip /> - <!-- no translation found for list_mode_showing (1225413902295895166) --> - <skip /> + <string name="grid_mode_showing" msgid="2803166871485028508">"Tablo modunda gösteriliyor."</string> + <string name="list_mode_showing" msgid="1225413902295895166">"Liste modunda gösteriliyor."</string> </resources> diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml index c701e5e2c..41cd0667d 100644 --- a/res/values-ur/strings.xml +++ b/res/values-ur/strings.xml @@ -278,8 +278,6 @@ <string name="work_tab" msgid="7265359366883747413">"دفتری"</string> <string name="a11y_work" msgid="7504431382825242153">"کام"</string> <string name="drag_from_another_app" msgid="8310249276199969905">"آپ کسی اور ایپ سے فائلیں منتقل نہیں کر سکتے ہیں۔"</string> - <!-- no translation found for grid_mode_showing (2803166871485028508) --> - <skip /> - <!-- no translation found for list_mode_showing (1225413902295895166) --> - <skip /> + <string name="grid_mode_showing" msgid="2803166871485028508">"گرڈ وضع میں دکھائی جا رہی ہیں۔"</string> + <string name="list_mode_showing" msgid="1225413902295895166">"فہرست وضع میں دکھائی جا رہی ہیں۔"</string> </resources> diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml index 03a17ad8c..12205790b 100644 --- a/res/values-uz/strings.xml +++ b/res/values-uz/strings.xml @@ -278,8 +278,6 @@ <string name="work_tab" msgid="7265359366883747413">"Ish"</string> <string name="a11y_work" msgid="7504431382825242153">"Ish"</string> <string name="drag_from_another_app" msgid="8310249276199969905">"Fayllarni boshqa ilovadan koʻchirish imkonsiz."</string> - <!-- no translation found for grid_mode_showing (2803166871485028508) --> - <skip /> - <!-- no translation found for list_mode_showing (1225413902295895166) --> - <skip /> + <string name="grid_mode_showing" msgid="2803166871485028508">"Jadval shaklida chiqarilmoqda."</string> + <string name="list_mode_showing" msgid="1225413902295895166">"Roʻyxat shaklida chiqarilmoqda."</string> </resources> diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml index c4ff325bb..cd3f7876e 100644 --- a/res/values-vi/strings.xml +++ b/res/values-vi/strings.xml @@ -278,8 +278,6 @@ <string name="work_tab" msgid="7265359366883747413">"Công việc"</string> <string name="a11y_work" msgid="7504431382825242153">"Công việc"</string> <string name="drag_from_another_app" msgid="8310249276199969905">"Bạn không thể di chuyển các tệp từ một ứng dụng khác."</string> - <!-- no translation found for grid_mode_showing (2803166871485028508) --> - <skip /> - <!-- no translation found for list_mode_showing (1225413902295895166) --> - <skip /> + <string name="grid_mode_showing" msgid="2803166871485028508">"Đang hiển thị ở chế độ lưới."</string> + <string name="list_mode_showing" msgid="1225413902295895166">"Đang hiển thị ở chế độ danh sách."</string> </resources> diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index 46bebdd27..7aead510a 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -278,8 +278,6 @@ <string name="work_tab" msgid="7265359366883747413">"工作"</string> <string name="a11y_work" msgid="7504431382825242153">"工作"</string> <string name="drag_from_another_app" msgid="8310249276199969905">"您无法移动其他应用中的文件。"</string> - <!-- no translation found for grid_mode_showing (2803166871485028508) --> - <skip /> - <!-- no translation found for list_mode_showing (1225413902295895166) --> - <skip /> + <string name="grid_mode_showing" msgid="2803166871485028508">"目前以网格模式显示。"</string> + <string name="list_mode_showing" msgid="1225413902295895166">"目前以列表模式显示。"</string> </resources> diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index 95b9439d4..445c621bc 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -278,8 +278,6 @@ <string name="work_tab" msgid="7265359366883747413">"工作"</string> <string name="a11y_work" msgid="7504431382825242153">"工作"</string> <string name="drag_from_another_app" msgid="8310249276199969905">"你無法將其他應用程式中的檔案移動至此。"</string> - <!-- no translation found for grid_mode_showing (2803166871485028508) --> - <skip /> - <!-- no translation found for list_mode_showing (1225413902295895166) --> - <skip /> + <string name="grid_mode_showing" msgid="2803166871485028508">"目前以格線模式顯示。"</string> + <string name="list_mode_showing" msgid="1225413902295895166">"目前以清單模式顯示。"</string> </resources> diff --git a/src/com/android/documentsui/AbstractActionHandler.java b/src/com/android/documentsui/AbstractActionHandler.java index 0c612eddd..d2f7e41c6 100644 --- a/src/com/android/documentsui/AbstractActionHandler.java +++ b/src/com/android/documentsui/AbstractActionHandler.java @@ -745,7 +745,7 @@ public abstract class AbstractActionHandler<T extends FragmentActivity & CommonA public void onRootLoaded(@Nullable RootInfo root) { if (root == null) { // There is no such root in the other profile. Maybe the provider is missing on - // the other profile. Create a dummy root and open it to show error message. + // the other profile. Create a placeholder root and open it to show error message. root = RootInfo.copyRootInfo(mOriginalRoot); root.userId = mSelectedUserId; } diff --git a/src/com/android/documentsui/BaseActivity.java b/src/com/android/documentsui/BaseActivity.java index 8c0d9693f..5efb9a93e 100644 --- a/src/com/android/documentsui/BaseActivity.java +++ b/src/com/android/documentsui/BaseActivity.java @@ -934,7 +934,7 @@ public abstract class BaseActivity getMainLooper().getQueue().addIdleHandler(new IdleHandler() { @Override public boolean queueIdle() { - // If startup benchmark is requested by a whitelisted testing package, then + // If startup benchmark is requested by an allowedlist testing package, then // close the activity once idle, and notify the testing activity. if (getIntent().getBooleanExtra(EXTRA_BENCHMARK, false) && BENCHMARK_TESTING_PACKAGE.equals(getCallingPackage())) { diff --git a/src/com/android/documentsui/DocsSelectionHelper.java b/src/com/android/documentsui/DocsSelectionHelper.java index b7a720c8b..956527a2e 100644 --- a/src/com/android/documentsui/DocsSelectionHelper.java +++ b/src/com/android/documentsui/DocsSelectionHelper.java @@ -37,10 +37,10 @@ public final class DocsSelectionHelper extends SelectionTracker<String> { private final DelegateFactory mFactory; - // initialize to a dummy object incase we get some input + // initialize to a stub object incase we get some input // event drive calls before we're properly initialized. // See: b/69306667. - private SelectionTracker<String> mDelegate = new DummySelectionTracker<>(); + private SelectionTracker<String> mDelegate = new StubSelectionTracker<>(); @VisibleForTesting DocsSelectionHelper(DelegateFactory factory) { diff --git a/src/com/android/documentsui/DrawerController.java b/src/com/android/documentsui/DrawerController.java index cb536162d..56b3a879f 100644 --- a/src/com/android/documentsui/DrawerController.java +++ b/src/com/android/documentsui/DrawerController.java @@ -55,7 +55,7 @@ public abstract class DrawerController implements DrawerListener { DrawerLayout layout = (DrawerLayout) activity.findViewById(R.id.drawer_layout); if (layout == null) { - return new DummyDrawerController(); + return new StubDrawerController(); } View drawer = activity.findViewById(R.id.drawer_roots); @@ -76,8 +76,8 @@ public abstract class DrawerController implements DrawerListener { /** * Returns a controller suitable for {@code Layout}. */ - static DrawerController createDummy() { - return new DummyDrawerController(); + static DrawerController createStub() { + return new StubDrawerController(); } private static int calculateDrawerWidth(Activity activity) { @@ -235,9 +235,9 @@ public abstract class DrawerController implements DrawerListener { } /* - * Dummy controller useful with clients that don't host a real drawer. + * Stub controller useful with clients that don't host a real drawer. */ - private static final class DummyDrawerController extends DrawerController { + private static final class StubDrawerController extends DrawerController { @Override public void setOpen(boolean open) {} diff --git a/src/com/android/documentsui/DummyProfileTabsAddons.java b/src/com/android/documentsui/StubProfileTabsAddons.java index 697025e23..cac175945 100644 --- a/src/com/android/documentsui/DummyProfileTabsAddons.java +++ b/src/com/android/documentsui/StubProfileTabsAddons.java @@ -17,9 +17,9 @@ package com.android.documentsui; /** - * A dummy {@ProfileTabsAddons} implementation. + * A stub {@ProfileTabsAddons} implementation. */ -public class DummyProfileTabsAddons implements ProfileTabsAddons { +public class StubProfileTabsAddons implements ProfileTabsAddons { @Override public void setEnabled(boolean enabled) { diff --git a/src/com/android/documentsui/DummySelectionTracker.java b/src/com/android/documentsui/StubSelectionTracker.java index 49b9ad918..1a392144f 100644 --- a/src/com/android/documentsui/DummySelectionTracker.java +++ b/src/com/android/documentsui/StubSelectionTracker.java @@ -26,10 +26,11 @@ import androidx.recyclerview.widget.RecyclerView.AdapterDataObserver; import java.util.Set; /** - * A dummy SelectionTracker used by DocsSelectionHelper before a real SelectionTracker has been + * A stub SelectionTracker used by DocsSelectionHelper before a real SelectionTracker has been * initialized by DirectoryFragment. + * @param <K> Selection key type which extends {@link SelectionTracker}. */ -public class DummySelectionTracker<K> extends SelectionTracker<K> { +public class StubSelectionTracker<K> extends SelectionTracker<K> { @Override public void addObserver(SelectionObserver observer) { diff --git a/src/com/android/documentsui/base/DummyLookup.java b/src/com/android/documentsui/base/StubLookup.java index 11a637580..2a2dc9bf1 100644 --- a/src/com/android/documentsui/base/DummyLookup.java +++ b/src/com/android/documentsui/base/StubLookup.java @@ -17,8 +17,10 @@ package com.android.documentsui.base; /** * Lookup that always returns null. + * @param <K> input type (the "key") which implements {@link Lookup}. + * @param <V> output type (the "value") which implements {@link Lookup}. */ -public final class DummyLookup<K, V> implements Lookup<K, V> { +public final class StubLookup<K, V> implements Lookup<K, V> { @Override public V lookup(K key) { return null; diff --git a/src/com/android/documentsui/dirlist/DirectoryFragment.java b/src/com/android/documentsui/dirlist/DirectoryFragment.java index a079ab1b8..ec396ff28 100644 --- a/src/com/android/documentsui/dirlist/DirectoryFragment.java +++ b/src/com/android/documentsui/dirlist/DirectoryFragment.java @@ -368,7 +368,7 @@ public class DirectoryFragment extends Fragment implements SwipeRefreshLayout.On mRecView.setItemAnimator(new DirectoryItemAnimator()); mInjector = mActivity.getInjector(); - // Initially, this selection tracker (delegator) uses a dummy implementation, so it must be + // Initially, this selection tracker (delegator) uses a stub implementation, so it must be // updated (reset) when necessary things are ready. mSelectionMgr = mInjector.selectionMgr; mModel = mInjector.getModel(); @@ -493,7 +493,7 @@ public class DirectoryFragment extends Fragment implements SwipeRefreshLayout.On this::getModelId, mRecView::findChildViewUnder, DocumentsApplication.getDragAndDropManager(mActivity)) - : DragStartListener.DUMMY; + : DragStartListener.STUB; { // Limiting the scope of the localTracker so nobody uses it. diff --git a/src/com/android/documentsui/dirlist/DocumentsAdapter.java b/src/com/android/documentsui/dirlist/DocumentsAdapter.java index 7d09d689f..41ce73c8c 100644 --- a/src/com/android/documentsui/dirlist/DocumentsAdapter.java +++ b/src/com/android/documentsui/dirlist/DocumentsAdapter.java @@ -36,8 +36,8 @@ import java.util.List; /** * DocumentsAdapter provides glue between a directory Model, and RecyclerView. We've * abstracted this a bit in order to decompose some specialized support - * for adding dummy layout objects (@see SectionBreakDocumentsAdapter). Handling of the - * dummy layout objects was error prone when interspersed with the core mode / adapter code. + * for adding stub layout objects (@see SectionBreakDocumentsAdapter). Handling of the + * stub layout objects was error prone when interspersed with the core mode / adapter code. * * @see ModelBackedDocumentsAdapter * @see DirectoryAddonsAdapter diff --git a/src/com/android/documentsui/dirlist/DragStartListener.java b/src/com/android/documentsui/dirlist/DragStartListener.java index 8fe087229..0adddcca8 100644 --- a/src/com/android/documentsui/dirlist/DragStartListener.java +++ b/src/com/android/documentsui/dirlist/DragStartListener.java @@ -48,7 +48,7 @@ import javax.annotation.Nullable; */ interface DragStartListener { - static final DragStartListener DUMMY = new DragStartListener() { + DragStartListener STUB = new DragStartListener() { @Override public boolean onDragEvent(MotionEvent event) { return false; diff --git a/src/com/android/documentsui/files/FilesActivity.java b/src/com/android/documentsui/files/FilesActivity.java index 1afb38eac..232f29809 100644 --- a/src/com/android/documentsui/files/FilesActivity.java +++ b/src/com/android/documentsui/files/FilesActivity.java @@ -37,7 +37,6 @@ import com.android.documentsui.ActionModeController; import com.android.documentsui.BaseActivity; import com.android.documentsui.DocsSelectionHelper; import com.android.documentsui.DocumentsApplication; -import com.android.documentsui.DummyProfileTabsAddons; import com.android.documentsui.FocusManager; import com.android.documentsui.Injector; import com.android.documentsui.MenuManager.DirectoryDetails; @@ -49,6 +48,7 @@ import com.android.documentsui.ProviderExecutor; import com.android.documentsui.R; import com.android.documentsui.SharedInputHandler; import com.android.documentsui.ShortcutsUpdater; +import com.android.documentsui.StubProfileTabsAddons; import com.android.documentsui.base.DocumentInfo; import com.android.documentsui.base.Features; import com.android.documentsui.base.RootInfo; @@ -76,7 +76,7 @@ public class FilesActivity extends BaseActivity implements AbstractActionHandler private Injector<ActionHandler<FilesActivity>> mInjector; private ActivityInputHandler mActivityInputHandler; private SharedInputHandler mSharedInputHandler; - private final ProfileTabsAddons mProfileTabsAddonsStub = new DummyProfileTabsAddons(); + private final ProfileTabsAddons mProfileTabsAddonsStub = new StubProfileTabsAddons(); public FilesActivity() { super(R.layout.files_activity, TAG); @@ -150,7 +150,7 @@ public class FilesActivity extends BaseActivity implements AbstractActionHandler mInjector.searchManager = mSearchManager; - // No profile tabs will be shown on FilesActivity. Use a dummy to avoid unnecessary + // No profile tabs will be shown on FilesActivity. Use a stub to avoid unnecessary // operations. mInjector.profileTabsController = new ProfileTabsController( mInjector.selectionMgr, diff --git a/src/com/android/documentsui/inspector/DebugView.java b/src/com/android/documentsui/inspector/DebugView.java index ffd4b7e05..908d19242 100644 --- a/src/com/android/documentsui/inspector/DebugView.java +++ b/src/com/android/documentsui/inspector/DebugView.java @@ -27,8 +27,8 @@ import androidx.annotation.StringRes; import com.android.documentsui.R; import com.android.documentsui.base.DocumentInfo; -import com.android.documentsui.base.DummyLookup; import com.android.documentsui.base.Lookup; +import com.android.documentsui.base.StubLookup; import com.android.documentsui.inspector.InspectorController.DebugDisplay; import java.text.NumberFormat; @@ -47,7 +47,7 @@ public class DebugView extends TableView implements DebugDisplay { private final Context mContext; private final Resources mRes; - private Lookup<String, Executor> mExecutors = new DummyLookup<>(); + private Lookup<String, Executor> mExecutors = new StubLookup<>(); public DebugView(Context context) { this(context, null); diff --git a/src/com/android/documentsui/sidebar/RootItem.java b/src/com/android/documentsui/sidebar/RootItem.java index 9af396e4c..a0a3210f8 100644 --- a/src/com/android/documentsui/sidebar/RootItem.java +++ b/src/com/android/documentsui/sidebar/RootItem.java @@ -210,13 +210,13 @@ public class RootItem extends Item { } /** - * Creates a dummy root item for a user. A dummy root item is used as a place holder when + * Creates a stub root item for a user. A stub root item is used as a place holder when * there is no such root available. We can therefore show the item on the UI. */ - public static RootItem createDummyItem(RootItem item, UserId targetUser) { - RootInfo dummyRootInfo = RootInfo.copyRootInfo(item.root); - dummyRootInfo.userId = targetUser; - RootItem dummy = new RootItem(dummyRootInfo, item.mActionHandler, item.mMaybeShowBadge); - return dummy; + public static RootItem createStubItem(RootItem item, UserId targetUser) { + RootInfo stubRootInfo = RootInfo.copyRootInfo(item.root); + stubRootInfo.userId = targetUser; + RootItem stub = new RootItem(stubRootInfo, item.mActionHandler, item.mMaybeShowBadge); + return stub; } } diff --git a/src/com/android/documentsui/sidebar/RootItemListBuilder.java b/src/com/android/documentsui/sidebar/RootItemListBuilder.java index 4bdce15f3..b29bd0d87 100644 --- a/src/com/android/documentsui/sidebar/RootItemListBuilder.java +++ b/src/com/android/documentsui/sidebar/RootItemListBuilder.java @@ -37,7 +37,7 @@ import java.util.List; * selected user. * * <p>If no root of the selected user was added but that of the other user was added, - * a dummy root of that root for the selected user will be generated. + * a stub root of that root for the selected user will be generated. * * <p>The builder group the roots using {@link Item#stringId} as key. * @@ -45,9 +45,9 @@ import java.util.List; * itemC[10], itemX[0],itemY[10] where root itemX, itemY do not support cross profile. * * <p>When the selected user is user 0, {@link #getList()} returns itemA[0], itemB[0], - * dummyC[0], itemX[0], itemY[10]. + * stubC[0], itemX[0], itemY[10]. * - * <p>When the selected user is user 10, {@link #getList()} returns itemA[10], dummyB[10], + * <p>When the selected user is user 10, {@link #getList()} returns itemA[10], stubB[10], * itemC[10], itemX[0], itemY[10]. */ class RootItemListBuilder { @@ -87,7 +87,7 @@ class RootItemListBuilder { return items; } - // If the root supports cross-profile, we return the added root or create a dummy root if + // If the root supports cross-profile, we return the added root or create a stub root if // it was not added for the selected user. for (RootItem item : items) { if (item.userId.equals(mSelectedUser)) { @@ -96,6 +96,6 @@ class RootItemListBuilder { } } - return Collections.singletonList(RootItem.createDummyItem(testRootItem, mSelectedUser)); + return Collections.singletonList(RootItem.createStubItem(testRootItem, mSelectedUser)); } } diff --git a/src/com/android/documentsui/sidebar/SpacerItem.java b/src/com/android/documentsui/sidebar/SpacerItem.java index d0f49c9d1..44dd75cbb 100644 --- a/src/com/android/documentsui/sidebar/SpacerItem.java +++ b/src/com/android/documentsui/sidebar/SpacerItem.java @@ -25,7 +25,7 @@ import com.android.documentsui.R; import com.android.documentsui.base.UserId; /** - * Dummy {@link Item} for dividers between different types of {@link Item}s. + * Stub {@link Item} for dividers between different types of {@link Item}s. */ class SpacerItem extends Item { private static final String TAG = "SpacerItem"; diff --git a/src/com/android/documentsui/util/VersionUtils.java b/src/com/android/documentsui/util/VersionUtils.java index 58ae3cdca..eecd63132 100644 --- a/src/com/android/documentsui/util/VersionUtils.java +++ b/src/com/android/documentsui/util/VersionUtils.java @@ -31,6 +31,6 @@ public class VersionUtils { */ public static boolean isAtLeastR() { return Build.VERSION.CODENAME.equals("R") - || (Build.VERSION.CODENAME.equals("REL") && Build.VERSION.SDK_INT >= 30); + || Build.VERSION.SDK_INT >= 30; } } diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml index cb43811d4..d5e9a6045 100644 --- a/tests/AndroidManifest.xml +++ b/tests/AndroidManifest.xml @@ -9,7 +9,8 @@ <application android:label="DocumentsUI Tests"> <uses-library android:name="android.test.runner" /> - <activity android:name="com.android.documentsui.SettingsActivity"> + <activity android:name="com.android.documentsui.SettingsActivity" + android:exported="true"> <intent-filter> <action android:name="android.provider.action.DOCUMENT_SETTINGS" /> <category android:name="android.intent.category.DEFAULT" /> @@ -20,7 +21,8 @@ </activity> <!--Needed for demo'ing and functional testing the open in provider feature in inspector --> - <activity android:name="com.android.documentsui.TestProviderActivity"> + <activity android:name="com.android.documentsui.TestProviderActivity" + android:exported="true"> <intent-filter> <action android:name="android.provider.action.DOCUMENT_SETTINGS" /> <category android:name="android.intent.category.DEFAULT" /> @@ -30,7 +32,8 @@ </intent-filter> </activity> - <activity android:name="com.android.documentsui.AuthenticationActivity"> + <activity android:name="com.android.documentsui.AuthenticationActivity" + android:exported="true"> <intent-filter> <action android:name="com.android.documentsui.test.action.AUTHENTICATE" /> <category android:name="android.intent.category.DEFAULT" /> @@ -130,6 +133,7 @@ <service android:name="com.android.documentsui.services.TestNotificationService" android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE" + android:exported="true" android:process="com.android.documentsui"> <intent-filter> <action android:name="android.service.notification.NotificationListenerService" /> diff --git a/tests/common/com/android/documentsui/InspectorProvider.java b/tests/common/com/android/documentsui/InspectorProvider.java index 1d678d12c..722799314 100644 --- a/tests/common/com/android/documentsui/InspectorProvider.java +++ b/tests/common/com/android/documentsui/InspectorProvider.java @@ -34,10 +34,10 @@ import java.io.FileNotFoundException; * * Structure of the provider. * - * Top ------------> Middle ------> Bottom -------> Dummy21 50B - * openInProvider Dummy1 50B Dummy11 50B Dummy22 150B - * test.txt Dummy2 150B Dummy12 150B Dummy23 100B - * update.txt Dummy3 100B Dummy13 100B + * Top ------------> Middle ------> Bottom -------> Stub21 50B + * openInProvider Stub1 50B Stub11 50B Stub22 150B + * test.txt Stub2 150B Stub12 150B Stub23 100B + * update.txt Stub3 100B Stub13 100B * test.jpg * invalid.jpg */ @@ -97,24 +97,24 @@ public class InspectorProvider extends TestRootProvider { if("Top".equals(s)) { MatrixCursor c = createDocCursor(projection); addFolder(c, "Middle"); - addFileWithSize(c, "dummy1", 50); - addFileWithSize(c, "dummy2", 150); - addFileWithSize(c, "dummy3", 100); + addFileWithSize(c, "stub1", 50); + addFileWithSize(c, "stub2", 150); + addFileWithSize(c, "stub3", 100); return c; } else if("Middle".equals(s)) { MatrixCursor c = createDocCursor(projection); addFolder(c, "Bottom"); - addFileWithSize(c, "dummy11", 50); - addFileWithSize(c, "dummy12", 150); - addFileWithSize(c, "dummy13", 100); + addFileWithSize(c, "stub11", 50); + addFileWithSize(c, "stub12", 150); + addFileWithSize(c, "stub13", 100); return c; } else if("Bottom".equals(s)) { MatrixCursor c = createDocCursor(projection); - addFileWithSize(c, "dummy21", 50); - addFileWithSize(c, "dummy22", 150); - addFileWithSize(c, "dummy23", 100); + addFileWithSize(c, "stub21", 50); + addFileWithSize(c, "stub22", 150); + addFileWithSize(c, "stub23", 100); return c; } else { diff --git a/tests/common/com/android/documentsui/bots/SearchBot.java b/tests/common/com/android/documentsui/bots/SearchBot.java index 13494f00d..d14fd1375 100644 --- a/tests/common/com/android/documentsui/bots/SearchBot.java +++ b/tests/common/com/android/documentsui/bots/SearchBot.java @@ -49,7 +49,7 @@ import org.hamcrest.Matcher; */ public class SearchBot extends Bots.BaseBot { - // Dumb search layout changes substantially between Ryu and Angler. + // Base search layout changes substantially between Ryu and Angler. @SuppressWarnings("unchecked") private static final Matcher<View> SEARCH_WIDGET = allOf( withId(R.id.option_menu_search), diff --git a/tests/common/com/android/documentsui/dirlist/TestFocusHandler.java b/tests/common/com/android/documentsui/dirlist/TestFocusHandler.java index 565665566..969ddcf36 100644 --- a/tests/common/com/android/documentsui/dirlist/TestFocusHandler.java +++ b/tests/common/com/android/documentsui/dirlist/TestFocusHandler.java @@ -22,7 +22,7 @@ import android.view.KeyEvent; import android.view.View; /** - * A purely dummy instance of FocusHandler. + * A purely placeholder instance of FocusHandler. */ public final class TestFocusHandler implements FocusHandler { diff --git a/tests/common/com/android/documentsui/testing/TestEnv.java b/tests/common/com/android/documentsui/testing/TestEnv.java index e5c7eb8d4..3249c8cf1 100644 --- a/tests/common/com/android/documentsui/testing/TestEnv.java +++ b/tests/common/com/android/documentsui/testing/TestEnv.java @@ -192,7 +192,7 @@ public class TestEnv { DocumentInfo rootDoc = model.getDocument( ModelId.build(model.mUserId, TestProvidersAccess.HOME.authority, "1")); - // These are test setup sanity checks, not test assertions. + // These are test setup quick checks, not test assertions. assert rootDoc != null; assert rootDoc.isDirectory(); assert FOLDER_0.equals(rootDoc); diff --git a/tests/common/com/android/documentsui/testing/Views.java b/tests/common/com/android/documentsui/testing/Views.java index 30f79a63a..6f5b1a2b8 100644 --- a/tests/common/com/android/documentsui/testing/Views.java +++ b/tests/common/com/android/documentsui/testing/Views.java @@ -34,7 +34,7 @@ public final class Views { } /* - * Dummy View object with (x, y) coordinates + * Mock View object with (x, y) coordinates */ public static View createTestView(float x, float y) { View view = createTestView(); diff --git a/tests/functional/com/android/documentsui/CancelFromNotificationUiTest.java b/tests/functional/com/android/documentsui/CancelFromNotificationUiTest.java index 06970560c..953e3504b 100644 --- a/tests/functional/com/android/documentsui/CancelFromNotificationUiTest.java +++ b/tests/functional/com/android/documentsui/CancelFromNotificationUiTest.java @@ -47,7 +47,7 @@ import java.util.concurrent.TimeUnit; public class CancelFromNotificationUiTest extends ActivityTest<FilesActivity> { private static final String TAG = "CancelFromNotificationUiTest"; - private static final String TARGET_FILE = "dummy.data"; + private static final String TARGET_FILE = "stub.data"; private static final int BUFFER_SIZE = 10 * 1024 * 1024; @@ -127,20 +127,20 @@ public class CancelFromNotificationUiTest extends ActivityTest<FilesActivity> { @Override public void initTestFiles() throws RemoteException { try { - createDummyFile(); + createStubFile(); } catch (Exception e) { fail("Initialization failed. " + e.toString()); } } - private void createDummyFile() throws Exception { + private void createStubFile() throws Exception { Uri uri = mDocsHelper.createDocument(rootDir0, "*/*", TARGET_FILE); - byte[] dummyByte = new byte[BUFFER_SIZE]; - mDocsHelper.writeDocument(uri, dummyByte); + byte[] stubByte = new byte[BUFFER_SIZE]; + mDocsHelper.writeDocument(uri, stubByte); for (int i = 0; i < 49; i++) { - dummyByte = null; - dummyByte = new byte[BUFFER_SIZE]; - mDocsHelper.writeAppendDocument(uri, dummyByte, dummyByte.length); + stubByte = null; + stubByte = new byte[BUFFER_SIZE]; + mDocsHelper.writeAppendDocument(uri, stubByte, stubByte.length); } } diff --git a/tests/functional/com/android/documentsui/FileDeleteUiTest.java b/tests/functional/com/android/documentsui/FileDeleteUiTest.java index d68dbd652..5a1396229 100644 --- a/tests/functional/com/android/documentsui/FileDeleteUiTest.java +++ b/tests/functional/com/android/documentsui/FileDeleteUiTest.java @@ -49,7 +49,7 @@ import java.util.concurrent.TimeUnit; public class FileDeleteUiTest extends ActivityTest<FilesActivity> { private static final String TAG = "FileDeleteUiTest"; - private static final int DUMMY_FILE_COUNT = 1000; + private static final int STUB_FILE_COUNT = 1000; private static final int WAIT_TIME_SECONDS = 60; @@ -126,17 +126,17 @@ public class FileDeleteUiTest extends ActivityTest<FilesActivity> { @Override public void initTestFiles() throws RemoteException { try { - createDummyFiles(); + createStubFiles(); } catch (Exception e) { fail("Initialization failed"); } } - private void createDummyFiles() throws Exception { + private void createStubFiles() throws Exception { final ThreadPoolExecutor exec = new ThreadPoolExecutor( 5, 5, 1000L, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(100, true)); - for (int i = 0; i < DUMMY_FILE_COUNT; i++) { + for (int i = 0; i < STUB_FILE_COUNT; i++) { final String fileName = "file" + String.format("%04d", i) + ".log"; if (exec.getQueue().size() >= 80) { Thread.sleep(50); diff --git a/tests/functional/com/android/documentsui/dirlist/DirectoryAddonsAdapterTest.java b/tests/functional/com/android/documentsui/dirlist/DirectoryAddonsAdapterTest.java index 303c8e521..bcd1131b7 100644 --- a/tests/functional/com/android/documentsui/dirlist/DirectoryAddonsAdapterTest.java +++ b/tests/functional/com/android/documentsui/dirlist/DirectoryAddonsAdapterTest.java @@ -186,7 +186,7 @@ public class DirectoryAddonsAdapterTest extends AndroidTestCase { assertTrue(mAdapter.getItemViewType(index) == type); } - private static class DummyAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> { + private static class StubAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> { @Override public int getItemCount() { diff --git a/tests/functional/com/android/documentsui/services/AbstractCopyJobTest.java b/tests/functional/com/android/documentsui/services/AbstractCopyJobTest.java index eaafb37e2..7b2cb828c 100644 --- a/tests/functional/com/android/documentsui/services/AbstractCopyJobTest.java +++ b/tests/functional/com/android/documentsui/services/AbstractCopyJobTest.java @@ -179,7 +179,7 @@ public abstract class AbstractCopyJobTest<T extends CopyJob> extends AbstractJob // Init FileCountProgressTracker with 10 docs required to copy. TestCopyJobProcessTracker<CopyJob.FileCountProgressTracker> tracker = new TestCopyJobProcessTracker(CopyJob.FileCountProgressTracker.class, 10, - createJob(newArrayList(mDocs.createFolder(mSrcRoot, "dummyDir"))), + createJob(newArrayList(mDocs.createFolder(mSrcRoot, "tempDir"))), (completed) -> NumberFormat.getPercentInstance().format(completed), (time) -> mContext.getString(R.string.copy_remaining, DateUtils.formatDuration((Long) time))); @@ -213,7 +213,7 @@ public abstract class AbstractCopyJobTest<T extends CopyJob> extends AbstractJob // Init ByteCountProgressTracker with 100 KBytes required to copy. TestCopyJobProcessTracker<CopyJob.ByteCountProgressTracker> tracker = new TestCopyJobProcessTracker(CopyJob.ByteCountProgressTracker.class, 100000, - createJob(newArrayList(mDocs.createFolder(mSrcRoot, "dummyDir"))), + createJob(newArrayList(mDocs.createFolder(mSrcRoot, "tempDir"))), (completed) -> NumberFormat.getPercentInstance().format(completed), (time) -> mContext.getString(R.string.copy_remaining, DateUtils.formatDuration((Long) time))); diff --git a/tests/unit/com/android/documentsui/DocsSelectionHelperTest.java b/tests/unit/com/android/documentsui/DocsSelectionHelperTest.java index e377f0a50..3d250073b 100644 --- a/tests/unit/com/android/documentsui/DocsSelectionHelperTest.java +++ b/tests/unit/com/android/documentsui/DocsSelectionHelperTest.java @@ -102,7 +102,7 @@ public class DocsSelectionHelperTest { mSelectionMgr.reset(mgr); } - private static final class TestSelectionManager extends DummySelectionTracker<String> { + private static final class TestSelectionManager extends StubSelectionTracker<String> { private boolean mCleared; private Map<String, Boolean> mSelected = new HashMap<>(); diff --git a/tests/unit/com/android/documentsui/ModelTest.java b/tests/unit/com/android/documentsui/ModelTest.java index 7d44477c5..15a11a84f 100644 --- a/tests/unit/com/android/documentsui/ModelTest.java +++ b/tests/unit/com/android/documentsui/ModelTest.java @@ -95,7 +95,7 @@ public class ModelTest { DirectoryResult r = new DirectoryResult(); r.cursor = cursor; - // Instantiate the model with a dummy view adapter and listener that (for now) do nothing. + // Instantiate the model with a stub view adapter and listener that (for now) do nothing. model = new Model(features); // not sure why we add a listener here at all. model.addUpdateListener(new TestEventListener<>()); diff --git a/tests/unit/com/android/documentsui/sidebar/RootItemListBuilderTest.java b/tests/unit/com/android/documentsui/sidebar/RootItemListBuilderTest.java index 2574ecc5a..aadb73630 100644 --- a/tests/unit/com/android/documentsui/sidebar/RootItemListBuilderTest.java +++ b/tests/unit/com/android/documentsui/sidebar/RootItemListBuilderTest.java @@ -173,10 +173,10 @@ public class RootItemListBuilderTest { List<RootItem> result = mBuilder.getList(); assertThat(result).containsExactlyElementsIn(Lists.newArrayList( - RootItem.createDummyItem( + RootItem.createStubItem( DOWNLOADS_DEFAULT_USER, TestProvidersAccess.OtherUser.USER_ID), SDCARD_DEFAULT_USER, - RootItem.createDummyItem(HOME_DEFAULT_USER, TestProvidersAccess.OtherUser.USER_ID), + RootItem.createStubItem(HOME_DEFAULT_USER, TestProvidersAccess.OtherUser.USER_ID), IMAGE_OTHER_USER, PICKLES_DEFAULT_USER)); } diff --git a/tests/unit/com/android/documentsui/sorting/SortModelTest.java b/tests/unit/com/android/documentsui/sorting/SortModelTest.java index da8903022..25c026e1f 100644 --- a/tests/unit/com/android/documentsui/sorting/SortModelTest.java +++ b/tests/unit/com/android/documentsui/sorting/SortModelTest.java @@ -70,14 +70,14 @@ public class SortModelTest { DIMENSION_3 }; - private static final DummyListener DUMMY_LISTENER = new DummyListener(); + private static final StubListener STUB_LISTENER = new StubListener(); private SortModel mModel; @Before public void setUp() { mModel = new SortModel(Arrays.asList(DIMENSIONS)); - mModel.addListener(DUMMY_LISTENER); + mModel.addListener(STUB_LISTENER); } @Test @@ -106,7 +106,7 @@ public class SortModelTest { mModel.setDimensionVisibility(DIMENSION_1.getId(), View.GONE); assertEquals(View.GONE, DIMENSION_1.getVisibility()); - assertEquals(SortModel.UPDATE_TYPE_VISIBILITY, DUMMY_LISTENER.mLastUpdateType); + assertEquals(SortModel.UPDATE_TYPE_VISIBILITY, STUB_LISTENER.mLastUpdateType); } @Test @@ -122,8 +122,8 @@ public class SortModelTest { assertSame(DIMENSION_1, sortedDimension); assertEquals(DIMENSION_1.getDefaultSortDirection(), sortedDimension.getSortDirection()); - assertSame(mModel, DUMMY_LISTENER.mLastSortModel); - assertEquals(SortModel.UPDATE_TYPE_SORTING, DUMMY_LISTENER.mLastUpdateType); + assertSame(mModel, STUB_LISTENER.mLastSortModel); + assertEquals(SortModel.UPDATE_TYPE_SORTING, STUB_LISTENER.mLastUpdateType); } @Test @@ -134,8 +134,8 @@ public class SortModelTest { assertSame(DIMENSION_1, sortedDimension); assertEquals(SortDimension.SORT_DIRECTION_DESCENDING, sortedDimension.getSortDirection()); - assertSame(mModel, DUMMY_LISTENER.mLastSortModel); - assertEquals(SortModel.UPDATE_TYPE_SORTING, DUMMY_LISTENER.mLastUpdateType); + assertSame(mModel, STUB_LISTENER.mLastSortModel); + assertEquals(SortModel.UPDATE_TYPE_SORTING, STUB_LISTENER.mLastUpdateType); } @Test @@ -147,8 +147,8 @@ public class SortModelTest { assertSame(DIMENSION_1, sortedDimension); assertEquals(SortDimension.SORT_DIRECTION_DESCENDING, sortedDimension.getSortDirection()); - assertSame(mModel, DUMMY_LISTENER.mLastSortModel); - assertEquals(SortModel.UPDATE_TYPE_SORTING, DUMMY_LISTENER.mLastUpdateType); + assertSame(mModel, STUB_LISTENER.mLastSortModel); + assertEquals(SortModel.UPDATE_TYPE_SORTING, STUB_LISTENER.mLastUpdateType); } @Test @@ -160,8 +160,8 @@ public class SortModelTest { assertSame(DIMENSION_1, sortedDimension); assertEquals(SortDimension.SORT_DIRECTION_DESCENDING, sortedDimension.getSortDirection()); - assertSame(mModel, DUMMY_LISTENER.mLastSortModel); - assertEquals(SortModel.UPDATE_TYPE_SORTING, DUMMY_LISTENER.mLastUpdateType); + assertSame(mModel, STUB_LISTENER.mLastSortModel); + assertEquals(SortModel.UPDATE_TYPE_SORTING, STUB_LISTENER.mLastUpdateType); } @Test @@ -225,7 +225,7 @@ public class SortModelTest { return mModel.getDimensionById(sortedDimensionId); } - private static class DummyListener implements UpdateListener { + private static class StubListener implements UpdateListener { private SortModel mLastSortModel; private @UpdateType int mLastUpdateType; |