From 5fb3a45a53f93b78f3097c771977e2cffb83f839 Mon Sep 17 00:00:00 2001
From: Tony Huang <tonyychuang@google.com>
Date: Fri, 20 Dec 2019 15:31:45 +0800
Subject: Manually close activity when SearchViewUiTest

When search bar expand then activity destroy, it has risk that
SearchFrament show caused by focus transition. This will cause
crash because fragment cannot show when stateSaved.

Bug: 142840883
Test: atest DocumentsUIGoogleTests
Change-Id: I3e37cefb0709284f02158c031fb135e9dd606662
---
 tests/functional/com/android/documentsui/SearchViewUiTest.java | 10 ++++++++++
 1 file changed, 10 insertions(+)

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);
-- 
cgit v1.2.3


From 706531326ddaebd7b191fd464f422c04fe9ff43d Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Sun, 22 Dec 2019 02:08:47 -0800
Subject: Import translations. DO NOT MERGE

Change-Id: If2d9d16e2f2633c7f0d6da5148a754601c2600ec
Auto-generated-cl: translation import
---
 res/values-vi/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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) -->
-- 
cgit v1.2.3