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

Commit c89bda91 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[DocsUI M3] Use use_material3 flag for hiding Image/Videos/Audio roots" into main

parents c18878d2 86d12b1f

flags.aconfig

+0 −8
Original line number Diff line number Diff line
@@ -41,14 +41,6 @@ flag { 
    is_fixed_read_only: true

}



flag {

    name: "hide_roots_on_desktop_ro"

    namespace: "documentsui"

    description: "Enables the hiding of the Images/Videos/Audio/Documents roots on desktop."

    bug: "381959330"

    is_fixed_read_only: true

}



flag {

    name: "redirect_get_content_ro"

    namespace: "documentsui"

src/com/android/documentsui/sidebar/RootsFragment.java

+1 −3
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package com.android.documentsui.sidebar; 
import static com.android.documentsui.base.Shared.compareToIgnoreCaseNullable;

import static com.android.documentsui.base.SharedMinimal.DEBUG;

import static com.android.documentsui.base.SharedMinimal.VERBOSE;

import static com.android.documentsui.util.FlagUtils.isHideRootsOnDesktopFlagEnabled;

import static com.android.documentsui.util.FlagUtils.isUseMaterial3FlagEnabled;



import android.app.admin.DevicePolicyManager;
@@ -481,14 +480,13 @@ public class RootsFragment extends Fragment { 


            if (root.isExternalStorageHome()) {

                continue;

            } else if (isHideRootsOnDesktopFlagEnabled()

            } else if (isUseMaterial3FlagEnabled()

                    && context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_PC)

                    && (root.isImages() || root.isVideos()

                    || root.isDocuments()

                    || root.isAudio())) {

                // Hide Images/Videos/Documents/Audio roots on desktop.

                Log.d(TAG, "Hiding " + root);

                continue;

            } else if (root.isLibrary() || root.isDownloads()) {

                item =

                        mUseRailAsContainer

src/com/android/documentsui/util/FlagUtils.kt

+0 −5
Original line number Diff line number Diff line
@@ -52,11 +52,6 @@ class FlagUtils { 
            return Flags.visualSignalsRo() && isUseMaterial3FlagEnabled()

        }



        @JvmStatic

        fun isHideRootsOnDesktopFlagEnabled(): Boolean {

            return Flags.hideRootsOnDesktopRo()

        }



        @JvmStatic

        fun isUsePeekPreviewFlagEnabled(): Boolean {

            return Flags.usePeekPreviewRo() && isUseMaterial3FlagEnabled()

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

+5 −5
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ package com.android.documentsui; 


import static com.android.documentsui.StubProvider.ROOT_0_ID;

import static com.android.documentsui.StubProvider.ROOT_1_ID;

import static com.android.documentsui.flags.Flags.FLAG_HIDE_ROOTS_ON_DESKTOP_RO;

import static com.android.documentsui.flags.Flags.FLAG_USE_MATERIAL3;



import android.content.pm.PackageManager;

import android.platform.test.annotations.RequiresFlagsDisabled;
@@ -69,8 +69,8 @@ public class FilesActivityDefaultsUiTest extends ActivityTestJunit4<FilesActivit 


    @Test

    @HugeLongTest

    @RequiresFlagsDisabled(FLAG_HIDE_ROOTS_ON_DESKTOP_RO)

    public void testDefaultRoots_hideRootsOnDesktopFlagDisabled() throws Exception {

    @RequiresFlagsDisabled(FLAG_USE_MATERIAL3)

    public void testDefaultRoots_useMaterial3FlagDisabled() throws Exception {

        device.waitForIdle();



        // Should also have Drive, but that requires pre-configuration of devices
@@ -86,8 +86,8 @@ public class FilesActivityDefaultsUiTest extends ActivityTestJunit4<FilesActivit 


    @Test

    @HugeLongTest

    @RequiresFlagsEnabled(FLAG_HIDE_ROOTS_ON_DESKTOP_RO)

    public void testDefaultRoots_hideRootsOnDesktopFlagEnabled() throws Exception {

    @RequiresFlagsEnabled(FLAG_USE_MATERIAL3)

    public void testDefaultRoots_useMaterial3FlagEnabled() throws Exception {

        device.waitForIdle();



        String[] expectedRoots;

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

+2 −3
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import static com.android.documentsui.StubProvider.ROOT_0_ID; 
import static com.android.documentsui.StubProvider.ROOT_1_ID;

import static com.android.documentsui.base.Providers.AUTHORITY_STORAGE;

import static com.android.documentsui.base.Providers.ROOT_ID_DEVICE;

import static com.android.documentsui.flags.Flags.FLAG_HIDE_ROOTS_ON_DESKTOP_RO;

import static com.android.documentsui.flags.Flags.FLAG_USE_MATERIAL3;

import static com.android.documentsui.flags.Flags.FLAG_USE_SEARCH_V2_READ_ONLY;
@@ -135,7 +134,7 @@ public class FilesActivityUiTest extends ActivityTestJunit4<FilesActivity> { 
    }



    @Test

    @RequiresFlagsDisabled(FLAG_HIDE_ROOTS_ON_DESKTOP_RO)

    @RequiresFlagsDisabled(FLAG_USE_MATERIAL3)

    public void testRootClick_SetsWindowTitle() throws Exception {

        bots.roots.openRoot("Images");

        bots.main.assertWindowTitle("Images");
@@ -216,7 +215,7 @@ public class FilesActivityUiTest extends ActivityTestJunit4<FilesActivity> { 


    @Test

    @HugeLongTest

    @RequiresFlagsDisabled(FLAG_HIDE_ROOTS_ON_DESKTOP_RO)

    @RequiresFlagsDisabled(FLAG_USE_MATERIAL3)

    public void testRootChange_UpdatesSortHeader() throws Exception {



        // switch to separate display modes for two separate roots. Each