Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1695ed71 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6659979 from 56154c7a to sc-release 

Change-Id: I69e8daee97e92d82dbda06c4a08d118b49921324
parents d0743a87 56154c7a

res/values-uz/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ 
    <string name="menu_hide_hidden_files" msgid="5654495713350153702">"Yashirin fayllar chiqmasin"</string>

    <string name="menu_view_in_owner" msgid="7228948660557554770">"<xliff:g id="SOURCE">%1$s</xliff:g> orqali ochish"</string>

    <string name="menu_new_window" msgid="2947837751796109126">"Yangi oyna"</string>

    <string name="menu_cut_to_clipboard" msgid="2878752142015026229">"Kesish"</string>

    <string name="menu_cut_to_clipboard" msgid="2878752142015026229">"Kesib olish"</string>

    <string name="menu_copy_to_clipboard" msgid="5064081159073330776">"Nusxa olish"</string>

    <string name="menu_paste_from_clipboard" msgid="360947260414135827">"Joylash"</string>

    <string name="menu_paste_into_folder" msgid="8000644546983240101">"Jildga qo‘shish"</string>

tests/functional/com/android/documentsui/CancelFromNotificationUiTest.java

+3 −4
Original line number Diff line number Diff line
@@ -35,8 +35,6 @@ import com.android.documentsui.files.FilesActivity; 
import com.android.documentsui.filters.HugeLongTest;

import com.android.documentsui.services.TestNotificationService;



import org.junit.Ignore;



import java.util.concurrent.CountDownLatch;

import java.util.concurrent.TimeUnit;
@@ -219,8 +217,9 @@ public class CancelFromNotificationUiTest extends ActivityTest<FilesActivity> { 


    @HugeLongTest

    // (TODO: b/156756197) : Deflake tests

    @Ignore

    public void testMoveDocument_CancelFromNotification() throws Exception {

    // Notice because this class inherits JUnit3 TestCase, the right way to suppress a test

    // is by removing "test" from prefix, instead of adding @Ignore.

    public void ignored_testMoveDocument_CancelFromNotification() throws Exception {

        bots.roots.openRoot(ROOT_0_ID);

        bots.directory.findDocument(TARGET_FILE);

        device.waitForIdle();

tests/functional/com/android/documentsui/FileCopyUiTest.java

+8 −2
Original line number Diff line number Diff line
@@ -431,7 +431,10 @@ public class FileCopyUiTest extends ActivityTest<FilesActivity> { 


    // Copy SD Card -> Internal Storage //

    @HugeLongTest

    public void testCopyDocuments_FromSdCard() throws Exception {

    // TODO (b/160649487): excluded in FRC MTS release, and we should add it back later.

    // Notice because this class inherits JUnit3 TestCase, the right way to suppress a test

    // is by removing "test" from prefix, instead of adding @Ignore.

    public void ignored_testCopyDocuments_FromSdCard() throws Exception {

        createDocuments(mSdCardLabel, mSdCardRoot, mStorageDocsHelper);

        copyFiles(mSdCardLabel, mDeviceLabel);
@@ -445,7 +448,10 @@ public class FileCopyUiTest extends ActivityTest<FilesActivity> { 


    // Copy Internal Storage -> SD Card //

    @HugeLongTest

    public void testCopyDocuments_ToSdCard() throws Exception {

    // TODO (b/160649487): excluded in FRC MTS release, and we should add it back later.

    // Notice because this class inherits JUnit3 TestCase, the right way to suppress a test

    // is by removing "test" from prefix, instead of adding @Ignore.

    public void ignored_testCopyDocuments_ToSdCard() throws Exception {

        createDocuments(mDeviceLabel, mPrimaryRoot, mStorageDocsHelper);

        copyFiles(mDeviceLabel, mSdCardLabel);