diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-12-24 02:06:22 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-12-24 02:06:22 +0000 |
| commit | 4af065edd3b90751f0311bf59bb63cbdcf660bf4 (patch) | |
| tree | 2030c1ea59ff3c2ed18d715905bd9bb6e76e932b | |
| parent | bf96a94b1871da23473dbaa682563e79855600c0 (diff) | |
| parent | c8a06927a0bbf2193092e242979c11bbafe9dab9 (diff) | |
| download | android_packages_apps_DocumentsUI-4af065edd3b90751f0311bf59bb63cbdcf660bf4.tar.gz android_packages_apps_DocumentsUI-4af065edd3b90751f0311bf59bb63cbdcf660bf4.tar.bz2 android_packages_apps_DocumentsUI-4af065edd3b90751f0311bf59bb63cbdcf660bf4.zip | |
Snap for 6095135 from c8a06927a0bbf2193092e242979c11bbafe9dab9 to qt-qpr2-release
Change-Id: I855f2686b544efa31546728561218b1e6d4d3961
| -rw-r--r-- | res/values-vi/strings.xml | 2 | ||||
| -rw-r--r-- | tests/functional/com/android/documentsui/SearchViewUiTest.java | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml index 8123daf64..8682f7b11 100644 --- a/res/values-vi/strings.xml +++ b/res/values-vi/strings.xml @@ -17,7 +17,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="files_label" msgid="771781190045103748">"Tệp"</string> - <string name="downloads_label" msgid="5462789470049501103">"Nội dung tải xuống"</string> + <string name="downloads_label" msgid="5462789470049501103">"Tệp đã tải xuống"</string> <!-- no translation found for app_label (8089292432455111409) --> <skip /> <!-- no translation found for launcher_label (799410258349837668) --> diff --git a/tests/functional/com/android/documentsui/SearchViewUiTest.java b/tests/functional/com/android/documentsui/SearchViewUiTest.java index 9a151f7fb..d18ac3c02 100644 --- a/tests/functional/com/android/documentsui/SearchViewUiTest.java +++ b/tests/functional/com/android/documentsui/SearchViewUiTest.java @@ -44,6 +44,16 @@ public class SearchViewUiTest extends ActivityTest<FilesActivity> { bots.directory.waitForDocument(fileName1); } + @Override + public void tearDown() throws Exception { + // manually close activity to avoid SearchFragment show when Activity close. ref b/142840883 + device.waitForIdle(); + device.pressBack(); + device.pressBack(); + device.pressBack(); + super.tearDown(); + } + public void testSearchIconVisible() throws Exception { // The default root (root 0) supports search bots.search.assertInputExists(false); |