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

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

Snap for 7201877 from 5ab70acb to mainline-documentsui-release 

Change-Id: If0a98b73dcd62ca41e751ccadb7220180c2d117d
parents 7cce3d23 5ab70acb

res/values-eu/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -268,7 +268,7 @@ 
    <string name="anonymous_application" msgid="7633027057951625862">"Anonimoa"</string>

    <string name="open_tree_button" msgid="6402871398424497776">"Erabili karpeta hau"</string>

    <string name="open_tree_dialog_title" msgid="6339509533852318569">"<xliff:g id="DIRECTORY">%2$s</xliff:g> direktorioko fitxategiak atzitzeko baimena eman nahi diozu <xliff:g id="APPNAME">%1$s</xliff:g> aplikazioari?"</string>

    <string name="open_tree_dialog_message" msgid="4120695398430659628">"<xliff:g id="APPNAME">%1$s</xliff:g> aplikazioak <xliff:g id="DIRECTORY">%2$s</xliff:g> direktorioan gordetako uneko eta etorkizuneko edukia atzitu ahalko du."</string>

    <string name="open_tree_dialog_message" msgid="4120695398430659628">"<xliff:g id="APPNAME">%1$s</xliff:g> aplikazioak <xliff:g id="DIRECTORY">%2$s</xliff:g> direktorioan gordetako oraingo eta etorkizuneko edukia atzitu ahalko du."</string>

    <string name="directory_blocked_header_title" msgid="1164584889578740066">"Ezin da erabili karpeta hori"</string>

    <string name="directory_blocked_header_subtitle" msgid="2829150911849033408">"Pribatutasuna babesteko, aukeratu beste karpeta bat"</string>

    <string name="create_new_folder_button" msgid="8859613309559794890">"Sortu karpeta bat"</string>

res/values-km/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ 
    <string name="menu_new_window" msgid="2947837751796109126">"ផ្ទាំងវិនដូថ្មី"</string>

    <string name="menu_cut_to_clipboard" msgid="2878752142015026229">"កាត់"</string>

    <string name="menu_copy_to_clipboard" msgid="5064081159073330776">"ចម្លង"</string>

    <string name="menu_paste_from_clipboard" msgid="360947260414135827">"បិទភ្ជាប់"</string>

    <string name="menu_paste_from_clipboard" msgid="360947260414135827">"ដាក់ចូល"</string>

    <string name="menu_paste_into_folder" msgid="8000644546983240101">"បិទភ្ជាប់ទៅក្នុងថត"</string>

    <string name="menu_advanced_show" msgid="7558626506462906726">"បង្ហាញទំហំផ្ទុកខាងក្នុង"</string>

    <string name="menu_advanced_hide" msgid="6488381508009246334">"លាក់​ឧបករណ៍​​ផ្ទុក​ខាងក្នុង"</string>

res/values-sw/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ 
    <string name="button_extract" msgid="1038674453689912247">"Toa"</string>

    <string name="button_move" msgid="8596460499325291272">"Hamisha"</string>

    <string name="button_dismiss" msgid="7235249361023803349">"Ondoa"</string>

    <string name="button_retry" msgid="4011461781916631389">"Jaribu Tena"</string>

    <string name="button_retry" msgid="4011461781916631389">"Jaribu tena"</string>

    <string name="button_clear" msgid="5412304437764369441">"Futa"</string>

    <string name="button_show_provider" msgid="6905880493806292753">"Onyesha kwenye programu ya mtoa huduma"</string>

    <string name="button_back" msgid="1888621708934742182">"Nyuma"</string>

res/values-vi/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -192,8 +192,8 @@ 
      <item quantity="one">Tệp này đã được chuyển đổi sang định dạng khác: <xliff:g id="LIST_0">%1$s</xliff:g></item>

    </plurals>

    <plurals name="clipboard_files_clipped" formatted="false" msgid="4847061634862926902">

      <item quantity="other">Đã sao chép <xliff:g id="COUNT_1">%1$d</xliff:g> mục vào khay nhớ tạm.</item>

      <item quantity="one">Đã sao chép <xliff:g id="COUNT_0">%1$d</xliff:g> mục vào khay nhớ tạm.</item>

      <item quantity="other">Đã sao chép <xliff:g id="COUNT_1">%1$d</xliff:g> mục vào bảng nhớ tạm.</item>

      <item quantity="one">Đã sao chép <xliff:g id="COUNT_0">%1$d</xliff:g> mục vào bảng nhớ tạm.</item>

    </plurals>

    <string name="file_operation_rejected" msgid="4301554203329008794">"Thao tác tệp không được hỗ trợ."</string>

    <string name="file_operation_error" msgid="2234357335716533795">"Thao tác tệp không thành công."</string>

src/com/android/documentsui/MultiRootDocumentsLoader.java

+19 −7
Original line number Diff line number Diff line
@@ -124,16 +124,21 @@ public abstract class MultiRootDocumentsLoader extends AsyncTaskLoader<Directory 


    @Override

    public DirectoryResult loadInBackground() {

        try {

            synchronized (mTasks) {

                return loadInBackgroundLocked();

            }

        } catch (InterruptedException e) {

            Log.w(TAG, "loadInBackground is interrupted: ", e);

            return null;

        }

    }



    public void setObserver(LockingContentObserver observer) {

        mObserver = observer;

    }



    private DirectoryResult loadInBackgroundLocked() {

    private DirectoryResult loadInBackgroundLocked() throws InterruptedException {

        if (mFirstPassLatch == null) {

            // First time through we kick off all the recent tasks, and wait

            // around to see if everyone finishes quickly.
@@ -144,6 +149,11 @@ public abstract class MultiRootDocumentsLoader extends AsyncTaskLoader<Directory 
                        getQueryTask(rootEntry.getKey(), rootEntry.getValue()));

            }



            if (isLoadInBackgroundCanceled()) {

                // Loader is cancelled (e.g. about to be reset), preempt loading.

                throw new InterruptedException("Loading is cancelled!");

            }



            mFirstPassLatch = new CountDownLatch(mTasks.size());

            for (QueryTask task : mTasks.values()) {

                mExecutors.lookup(task.authority).execute(task);
@@ -164,6 +174,11 @@ public abstract class MultiRootDocumentsLoader extends AsyncTaskLoader<Directory 
        int totalQuerySize = 0;

        List<Cursor> cursors = new ArrayList<>(mTasks.size());

        for (QueryTask task : mTasks.values()) {

            if (isLoadInBackgroundCanceled()) {

                // Loader is cancelled (e.g. about to be reset), preempt loading.

                throw new InterruptedException("Loading is cancelled!");

            }



            if (task.isDone()) {

                try {

                    final Cursor[] taskCursors = task.get();
@@ -291,7 +306,7 @@ public abstract class MultiRootDocumentsLoader extends AsyncTaskLoader<Directory 
        DirectoryResult oldResult = mResult;

        mResult = result;



        if (isStarted()) {

        if (isStarted() && !isAbandoned() && !isLoadInBackgroundCanceled()) {

            super.deliverResult(result);

        }
@@ -325,9 +340,6 @@ public abstract class MultiRootDocumentsLoader extends AsyncTaskLoader<Directory 
    protected void onReset() {

        super.onReset();



        // Ensure the loader is stopped

        onStopLoading();



        synchronized (mTasks) {

            for (QueryTask task : mTasks.values()) {

                mExecutors.lookup(task.authority).execute(() -> FileUtils.closeQuietly(task));