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

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

Snap for 13556564 from bb4ed836 to 25Q3-release 

Change-Id: I93ecc2d49b7080c006763982fff679be073ad5f8
parents d9edfd08 bb4ed836

flags.aconfig

+6 −6
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ flag { 
    name: "use_material3"

    namespace: "documentsui"

    description: "Use Material 3 theme and styles."

    bug: "373720657"

    bug: "401974530"

    is_fixed_read_only: true

}
@@ -13,7 +13,7 @@ flag { 
    name: "use_search_v2_read_only"

    namespace: "documentsui"

    description: "Enables the next generation search functionality."

    bug: "383412640"

    bug: "408892602"

    is_fixed_read_only: true

}
@@ -21,7 +21,7 @@ flag { 
    name: "zip_ng_ro"

    namespace: "documentsui"

    description: "Enables the next generation ZIP functionality."

    bug: "382550591"

    bug: "411269957"

    is_fixed_read_only: true

}
@@ -29,7 +29,7 @@ flag { 
    name: "desktop_file_handling_ro"

    namespace: "documentsui"

    description: "Enables desktop file handling."

    bug: "381778967"

    bug: "406599215"

    is_fixed_read_only: true

}
@@ -37,7 +37,7 @@ flag { 
    name: "visual_signals_ro"

    namespace: "documentsui"

    description: "Enables in-app progress display of file operations"

    bug: "378011512"

    bug: "401974530"

    is_fixed_read_only: true

}
@@ -53,6 +53,6 @@ flag { 
    name: "use_peek_preview_ro"

    namespace: "documentsui"

    description: "Enables the Peek previewing capability as a substitute for the Inspector."

    bug: "373242058"

    bug: "411269618"

    is_fixed_read_only: true

}

proguard.flags

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ 
  int feature_notification_channel;

  int full_bar_search_view;

  int is_launcher_enabled;

  int show_media_roots;

  int show_search_bar;

  int show_apps_row;

}

res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -26,6 +26,9 @@ 
         layouts we reduce this to an input-box adjacent to menu actions. -->

    <bool name="full_bar_search_view">true</bool>



    <!-- Indicates if showing Audio / Downloads / Images / Video roots -->

    <bool name="show_media_roots">true</bool>



    <!-- Indicates if showing as search bar design -->

    <bool name="show_search_bar">false</bool>

res/values/overlayable.xml

+7 −6
Original line number Diff line number Diff line
@@ -39,9 +39,9 @@ 
            <!-- END THEME / STYLE -->



            <!-- START COLOR -->

            <item type="color" name="primary"/>

            <item type="color" name="list_item_selected_background_color"/>

            <item type="color" name="color_surface_header"/>

            <item type="color" name="list_item_selected_background_color"/>

            <item type="color" name="primary"/>

            <!-- END COLOR -->



            <!-- START DIMEN -->
@@ -50,22 +50,23 @@ 
            <!-- END DIMEN -->



            <!-- START DRAWABLE -->

            <item type="drawable" name="ic_advanced_shortcut"/>

            <item type="drawable" name="ic_eject"/>

            <item type="drawable" name="ic_root_download"/>

            <item type="drawable" name="ic_sd_storage"/>

            <item type="drawable" name="ic_root_smartphone"/>

            <item type="drawable" name="ic_sd_storage"/>

            <item type="drawable" name="root_list_selector"/>

            <item type="drawable" name="ic_advanced_shortcut"/>

            <!-- END DRAWABLE -->



            <!-- START BOOLEAN CONFIG -->

            <item type="bool" name="config_button_all_caps"/>

            <item type="bool" name="config_default_show_device_root"/>

            <item type="bool" name="force_material3"/>

            <item type="bool" name="handle_view_downloads_intent"/>

            <item type="bool" name="is_launcher_enabled"/>

            <item type="bool" name="show_search_bar"/>

            <item type="bool" name="show_apps_row"/>

            <item type="bool" name="force_material3"/>

            <item type="bool" name="show_media_roots"/>

            <item type="bool" name="show_search_bar"/>

            <!-- END BOOLEAN CONFIG -->



            <!-- START STRING CONFIG -->

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

+4 −4
Original line number Diff line number Diff line
@@ -476,18 +476,18 @@ public class RootsFragment extends Fragment { 
        final RootItemListBuilder storageProvidersBuilder = new RootItemListBuilder(selectedUser,

                userIds);

        final List<RootItem> otherProviders = new ArrayList<>();

        final boolean hideMediaRoots = isUseMaterial3FlagEnabled()

                && !getResources().getBoolean(R.bool.show_media_roots);



        for (final RootInfo root : roots) {

            final RootItem item;



            if (root.isExternalStorageHome()) {

                continue;

            } else if (isUseMaterial3FlagEnabled()

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

                // No-op.

            } else if (hideMediaRoots

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

                    || root.isDocuments()

                    || root.isAudio())) {

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

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

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

                item =