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

Commit 0b021d24 authored by Xin Li's avatar Xin Li
Browse files

DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master 

Bug: 146167222
Change-Id: I213c29dbe0816dd6db186580970decdc65d329a3
parents 9e2904c4 c7a8eb5b

Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -39,6 +39,8 @@ java_defaults { 
    sdk_version: "system_current",

    min_sdk_version: "28",

    target_sdk_version: "28",



    plugins: ["java_api_finder"],

}



filegroup {

res/layout/item_doc_inflated_message.xml

+10 −12
Original line number Diff line number Diff line
@@ -18,34 +18,32 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@android:id/empty"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:layout_height="wrap_content"

    android:background="?android:attr/colorBackground"

    android:focusable="true">



    <RelativeLayout

    <LinearLayout

        android:id="@+id/content"

        android:layout_width="match_parent"

        android:layout_height="match_parent">

        android:layout_height="wrap_content"

        android:orientation="vertical">



        <ImageView

            android:id="@+id/artwork"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_width="fill_parent"

            android:layout_alignParentTop="true"

            android:layout_marginBottom="25dp"

            android:scaleType="fitCenter"

            android:maxHeight="250dp"

            android:adjustViewBounds="true"

            android:contentDescription="@null"/>



        <TextView

            android:id="@+id/message"

            android:layout_width="wrap_content"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_below="@+id/artwork"

            android:layout_centerHorizontal="true"

            android:layout_marginBottom="25dp"

            android:gravity="center_horizontal"

            style="?android:attr/textAppearanceListItem"/>



    </RelativeLayout>



    </LinearLayout>

</FrameLayout>
 
 No newline at end of file

tests/common/com/android/documentsui/DocumentsProviderHelper.java

+11 −8
Original line number Diff line number Diff line
@@ -20,8 +20,11 @@ import static android.content.ContentResolver.wrap; 
import static android.provider.DocumentsContract.buildChildDocumentsUri;

import static android.provider.DocumentsContract.buildDocumentUri;

import static android.provider.DocumentsContract.buildRootsUri;

import static com.android.documentsui.base.DocumentInfo.getCursorString;



import static androidx.core.util.Preconditions.checkArgument;



import static com.android.documentsui.base.DocumentInfo.getCursorString;



import static junit.framework.Assert.assertEquals;

import static junit.framework.Assert.assertNotNull;

import static junit.framework.Assert.fail;
@@ -30,6 +33,7 @@ import android.content.ContentProviderClient; 
import android.database.Cursor;

import android.net.Uri;

import android.os.Bundle;

import android.os.FileUtils;

import android.os.ParcelFileDescriptor;

import android.os.ParcelFileDescriptor.AutoCloseInputStream;

import android.os.ParcelFileDescriptor.AutoCloseOutputStream;
@@ -37,23 +41,22 @@ import android.os.RemoteException; 
import android.provider.DocumentsContract;

import android.provider.DocumentsContract.Document;

import android.provider.DocumentsContract.Root;

import androidx.annotation.Nullable;

import android.test.MoreAsserts;

import android.text.TextUtils;



import androidx.annotation.Nullable;



import com.android.documentsui.base.DocumentInfo;

import com.android.documentsui.base.RootInfo;

import com.android.documentsui.roots.RootCursorWrapper;



import android.os.FileUtils;

import libcore.io.Streams;



import com.google.common.collect.Lists;



import libcore.io.Streams;



import java.io.FileNotFoundException;

import java.io.IOException;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.List;



/**
@@ -147,11 +150,11 @@ public class DocumentsProviderHelper { 
        waitForWrite();

    }



    public void writeAppendDocument(Uri documentUri, byte[] contents)

    public void writeAppendDocument(Uri documentUri, byte[] contents, int length)

            throws RemoteException, IOException {

        ParcelFileDescriptor file = mClient.openFile(documentUri, "wa", null);

        try (AutoCloseOutputStream out = new AutoCloseOutputStream(file)) {

            out.write(contents);

            out.write(contents, 0, length);

        }

        waitForWrite();

    }

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

+2 −3
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ import android.view.MotionEvent; 
import com.android.documentsui.base.Features;

import com.android.documentsui.base.RootInfo;

import com.android.documentsui.bots.Bots;

import com.android.documentsui.bots.UiBot;

import com.android.documentsui.files.FilesActivity;



import javax.annotation.Nullable;
@@ -145,8 +145,7 @@ public abstract class ActivityTest<T extends Activity> extends ActivityInstrumen 
    }



    protected void launchActivity() {

        final Intent intent = context.getPackageManager().getLaunchIntentForPackage(

                UiBot.targetPackageName);

        final Intent intent = new Intent(context, FilesActivity.class);

        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK);

        if (getInitialRoot() != null) {

            intent.setAction(Intent.ACTION_VIEW);

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

+1 −1
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ public class CancelFromNotificationUiTest extends ActivityTest<FilesActivity> { 
        for (int i = 0; i < 49; i++) {

            dummyByte = null;

            dummyByte = new byte[BUFFER_SIZE];

            mDocsHelper.writeAppendDocument(uri, dummyByte);

            mDocsHelper.writeAppendDocument(uri, dummyByte, dummyByte.length);

        }

    }