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

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

Snap for 6635763 from 1e04d34d to sc-d1-release 

Change-Id: I8e8a1f59153e2f62e3e1d7909f564f64fd6b7914
parents 881dd31a 1e04d34d

src/com/android/documentsui/ActivityConfig.java

+3 −2
Original line number Diff line number Diff line
@@ -37,8 +37,9 @@ public abstract class ActivityConfig { 
    }



    /**

     * When managed mode is enabled, active downloads will be visible in the UI.

     * Presumably this should only be true when in the downloads directory.

     * When managed mode is enabled, there will be special UI behaviors:

     * 1) active downloads will be visible in the UI.

     * 2) Android/[data|obb|sandbox] directories will not be hidden.

     */

    public boolean managedModeEnabled(DocumentStack stack) {

        return false;

src/com/android/documentsui/CreateDirectoryFragment.java

+1 −1
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ public class CreateDirectoryFragment extends DialogFragment { 
                mActivity.onDirectoryCreated(result);

                Metrics.logCreateDirOperation();

            } else {

                Snackbars.makeSnackbar(mActivity, R.string.create_error, Snackbar.LENGTH_SHORT)

                Snackbars.makeSnackbar(mActivity, R.string.create_error, Snackbar.LENGTH_LONG)

                        .show();

                Metrics.logCreateDirError();

            }

src/com/android/documentsui/archives/ArchivesProvider.java

+15 −7
Original line number Diff line number Diff line
@@ -25,18 +25,18 @@ import android.graphics.Point; 
import android.net.Uri;

import android.os.Bundle;

import android.os.CancellationSignal;

import android.os.FileUtils;

import android.os.ParcelFileDescriptor;

import android.provider.DocumentsContract;

import android.provider.DocumentsContract.Document;

import android.provider.DocumentsContract.Root;

import android.provider.DocumentsProvider;

import androidx.annotation.Nullable;

import android.util.Log;



import com.android.documentsui.R;

import androidx.annotation.GuardedBy;

import androidx.annotation.Nullable;



import android.os.FileUtils;

import com.android.documentsui.R;



import java.io.FileNotFoundException;

import java.io.IOException;
@@ -129,6 +129,14 @@ public class ArchivesProvider extends DocumentsProvider { 
        return cursor;

    }



    /** Overrides a hidden API. */

    public Cursor queryChildDocumentsForManage(String parentDocumentId,

            @Nullable String[] projection, @Nullable String sortOrder)

            throws FileNotFoundException {

        // No special handling of Archives in managed mode.

        return queryChildDocuments(parentDocumentId, projection, sortOrder);

    }



    @Override

    public String getDocumentType(String documentId) throws FileNotFoundException {

        final ArchiveId archiveId = ArchiveId.fromDocumentId(documentId);

src/com/android/documentsui/dirlist/DragHost.java

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ class DragHost<T extends Activity & AbstractActionHandler.CommonAddons> extends 
        Metrics.logDragInitiated(dragInitiatedFromDocsUI);

        if (!dragInitiatedFromDocsUI) {

            Snackbar.make(

                    v, R.string.drag_from_another_app, Snackbar.LENGTH_SHORT).show();

                    v, R.string.drag_from_another_app, Snackbar.LENGTH_LONG).show();

            return false;

        }

        return true;

src/com/android/documentsui/picker/CreatePickedDocumentTask.java

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ class CreatePickedDocumentTask extends PairedTask<Activity, Void, Uri> { 
            mCallback.accept(result);

        } else {

            Snackbars.makeSnackbar(

                    mOwner, R.string.save_error, Snackbar.LENGTH_SHORT).show();

                    mOwner, R.string.save_error, Snackbar.LENGTH_LONG).show();

        }



        mInProgressStateListener.accept(false);