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

Commit f9ddc5a8 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 14071582 from 5721576b to 25Q4-release 

Change-Id: I2612d3d7480c87182d1095957df1bb76fffe0a8a
parents 7aefa36f 5721576b

proguard.flags

+10 −0
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ 
  int action_menu_move_to;

  int action_menu_open_with;

  int action_menu_rename;

  int action_menu_restore_from_trash;

  int action_menu_select;

  int action_menu_select_all;

  int action_menu_share;
@@ -299,6 +300,11 @@ 
-keep interface com.android.documentsui.UserManagerProvider {

  public java.util.List getUserIds(android.content.Context);

}



-keep class com.android.documentsui.files.ActionHandler {

  public void restoreSelectedDocumentsFromTrash(java.util.List);

}



-keep interface androidx.drawerlayout.widget.DrawerLayout$DrawerListener {

}

-keep class androidx.drawerlayout.widget.DrawerLayout$SimpleDrawerListener {
@@ -314,3 +320,7 @@ 
  public void openDrawer(int);

  public void removeDrawerListener(androidx.drawerlayout.widget.DrawerLayout$DrawerListener);

}



-keep class android.provider.Flags {

  public static boolean enableDocumentsTrashApi();

}
 
 No newline at end of file

tests/common/com/android/documentsui/bots/UiBot.java

+11 −9
Original line number Diff line number Diff line
@@ -78,11 +78,6 @@ public class UiBot extends Bots.BaseBot { 
            isAssignableFrom(Toolbar.class),

            withId(R.id.toolbar));

    @SuppressWarnings("unchecked")

    private static final Matcher<View> ACTIONBAR =

            isUseMaterial3FlagEnabled()

                    ? allOf(isAssignableFrom(MaterialToolbar.class), withId(R.id.selection_bar))

                    : allOf(withClassName(endsWith("ActionBarContextView")));

    @SuppressWarnings("unchecked")

    private static final Matcher<View> TEXT_ENTRY = allOf(

            withClassName(endsWith("EditText")));

    @SuppressWarnings("unchecked")
@@ -90,9 +85,6 @@ public class UiBot extends Bots.BaseBot { 
            withClassName(endsWith("OverflowMenuButton")),

            ViewMatchers.isDescendantOfA(TOOLBAR));

    @SuppressWarnings("unchecked")

    private static final Matcher<View> ACTIONBAR_OVERFLOW = allOf(

            withClassName(endsWith("OverflowMenuButton")),

            ViewMatchers.isDescendantOfA(ACTIONBAR));



    public static String targetPackageName;
@@ -274,8 +266,18 @@ public class UiBot extends Bots.BaseBot { 
        onView(withId(id)).perform(clickAndRetryOnLongPress());

    }



    private Matcher<View> getActionbarOverflow() {

        final Matcher<View> actionBar =

                isUseMaterial3FlagEnabled()

                        ? allOf(isAssignableFrom(MaterialToolbar.class), withId(R.id.selection_bar))

                        : allOf(withClassName(endsWith("ActionBarContextView")));

        return allOf(

                withClassName(endsWith("OverflowMenuButton")),

                ViewMatchers.isDescendantOfA(actionBar));

    }



    public void clickActionbarOverflowItem(String label) {

        onView(ACTIONBAR_OVERFLOW).perform(clickAndRetryOnLongPress());

        onView(getActionbarOverflow()).perform(clickAndRetryOnLongPress());

        mDevice.waitForIdle();

        // Click the item by label, since Espresso doesn't support lookup by id on overflow.

        onView(withText(label)).perform(click());

tests/functional/com/android/documentsui/services/RestoreJobTest.kt

+3 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.app.Notification.CATEGORY_ERROR 
import android.app.Notification.EXTRA_TEXT

import android.app.Notification.EXTRA_TITLE

import android.net.Uri

import android.os.Build

import android.platform.test.annotations.EnableFlags

import android.platform.test.annotations.RequiresFlagsEnabled

import android.platform.test.flag.junit.CheckFlagsRule
@@ -27,6 +28,7 @@ import android.platform.test.flag.junit.DeviceFlagsValueProvider 
import android.provider.DocumentsContract.buildDocumentUri

import android.provider.Flags.FLAG_ENABLE_DOCUMENTS_TRASH_API

import androidx.test.filters.MediumTest

import androidx.test.filters.SdkSuppress

import com.android.documentsui.TrashDocumentHelper

import com.android.documentsui.flags.Flags

import com.android.documentsui.rules.OverrideFlagsRule
@@ -53,6 +55,7 @@ import org.junit.Test 
 */

@MediumTest

@RequiresFlagsEnabled(FLAG_ENABLE_DOCUMENTS_TRASH_API)

@SdkSuppress(minSdkVersion = Build.VERSION_CODES.BAKLAVA, codeName = "B")

internal class RestoreJobTest : AbstractJobTest<TrashJob>() {

    @get:Rule val setFlags = OverrideFlagsRule()

tests/functional/com/android/documentsui/services/TrashJobTest.kt

+3 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.app.Notification.CATEGORY_ERROR 
import android.app.Notification.EXTRA_TEXT

import android.app.Notification.EXTRA_TITLE

import android.net.Uri

import android.os.Build

import android.platform.test.annotations.EnableFlags

import android.platform.test.annotations.RequiresFlagsEnabled

import android.platform.test.flag.junit.CheckFlagsRule
@@ -27,6 +28,7 @@ import android.platform.test.flag.junit.DeviceFlagsValueProvider 
import android.provider.DocumentsContract.buildDocumentUri

import android.provider.Flags.FLAG_ENABLE_DOCUMENTS_TRASH_API

import androidx.test.filters.MediumTest

import androidx.test.filters.SdkSuppress

import com.android.documentsui.TrashDocumentHelper

import com.android.documentsui.base.DocumentInfo

import com.android.documentsui.flags.Flags
@@ -41,6 +43,7 @@ import org.junit.Test 
/** Tests TrashJob. */

@MediumTest

@RequiresFlagsEnabled(FLAG_ENABLE_DOCUMENTS_TRASH_API)

@SdkSuppress(minSdkVersion = Build.VERSION_CODES.BAKLAVA, codeName = "B")

internal class TrashJobTest : AbstractJobTest<TrashJob>() {

    @get:Rule val setFlags = OverrideFlagsRule()

tests/unit/com/android/documentsui/TrashFileLoaderTest.kt

+3 −0
Original line number Diff line number Diff line
@@ -16,12 +16,14 @@ 


package com.android.documentsui



import android.os.Build

import android.platform.test.annotations.RequiresFlagsEnabled

import android.platform.test.flag.junit.CheckFlagsRule

import android.platform.test.flag.junit.DeviceFlagsValueProvider

import android.provider.DocumentsContract

import android.provider.Flags

import androidx.test.filters.MediumTest

import androidx.test.filters.SdkSuppress

import com.android.documentsui.base.State

import com.android.documentsui.base.UserId

import com.android.documentsui.loaders.TrashFileLoader
@@ -47,6 +49,7 @@ import org.mockito.Mockito.`when` as whenever 
@RunWith(Parameterized::class)

@MediumTest

@RequiresFlagsEnabled(Flags.FLAG_ENABLE_DOCUMENTS_TRASH_API)

@SdkSuppress(minSdkVersion = Build.VERSION_CODES.BAKLAVA, codeName = "B")

internal class TrashFileLoaderTest {

    private lateinit var mEnv: TestEnv

    private lateinit var mActivity: TestActivity