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

Commit ff38e103 authored by Luciano Pacheco's avatar Luciano Pacheco Committed by Android (Google) Code Review
Browse files

Merge "DocsUI: Add proguard for trash feature" into main

parents eb85bb1a 7ca5413f

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/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

tests/unit/com/android/documentsui/files/MenuManagerTest.java

+6 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import static org.mockito.Mockito.doReturn; 


import android.annotation.SuppressLint;

import android.net.Uri;

import android.os.Build;

import android.platform.test.annotations.DisableFlags;

import android.platform.test.annotations.EnableFlags;

import android.platform.test.annotations.RequiresFlagsEnabled;
@@ -40,6 +41,7 @@ import android.provider.DocumentsContract.Document; 
import android.provider.DocumentsContract.Root;



import androidx.recyclerview.selection.SelectionTracker;

import androidx.test.filters.SdkSuppress;

import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;
@@ -1028,6 +1030,7 @@ public final class MenuManagerTest { 
    @Test

    @RequiresFlagsEnabled({FLAG_ENABLE_DOCUMENTS_TRASH_API})

    @EnableFlags(Flags.FLAG_ENABLE_TRASH_FLOW_RO)

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

    public void testActionMenu_canTrash_enabled() {

        assumeTrashApiIsAvailable();

        selectionDetails.canTrash = false;
@@ -1042,6 +1045,7 @@ public final class MenuManagerTest { 
    @Test

    @RequiresFlagsEnabled({FLAG_ENABLE_DOCUMENTS_TRASH_API})

    @DisableFlags(Flags.FLAG_ENABLE_TRASH_FLOW_RO)

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

    public void testActionMenu_canTrash_disabled() {

        assumeTrashApiIsAvailable();

        selectionDetails.canTrash = false;
@@ -1057,6 +1061,7 @@ public final class MenuManagerTest { 
    @Test

    @RequiresFlagsEnabled({FLAG_ENABLE_DOCUMENTS_TRASH_API})

    @EnableFlags({Flags.FLAG_ENABLE_TRASH_FLOW_RO})

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

    public void testActionMenu_canRestoreFromTrash_enabled() {

        assumeTrashApiIsAvailable();

        selectionDetails.canRestore = false;
@@ -1071,6 +1076,7 @@ public final class MenuManagerTest { 
    @Test

    @RequiresFlagsEnabled({FLAG_ENABLE_DOCUMENTS_TRASH_API})

    @DisableFlags({Flags.FLAG_ENABLE_TRASH_FLOW_RO})

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

    public void testActionMenu_canRestoreFromTrash_disabled() {

        assumeTrashApiIsAvailable();

        selectionDetails.canRestore = false;