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

Commit ea6aaf70 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 7080740 from a4005b9a to mainline-documentsui-release 

Change-Id: Ic4e1665975ed04b62c7049cbb75e72bcf5a57c5b
parents 8f826916 a4005b9a

AndroidManifest.xml

+1 −16
Original line number Diff line number Diff line
@@ -30,27 +30,12 @@ 
    <uses-permission android:name="android.permission.CHANGE_OVERLAY_PACKAGES" />

    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" />

    <uses-permission android:name="android.permission.MODIFY_QUIET_MODE" />

    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />



    <!-- Permissions required for reading and logging compat changes -->

    <uses-permission android:name="android.permission.LOG_COMPAT_CHANGE"/>

    <uses-permission android:name="android.permission.READ_COMPAT_CHANGE_CONFIG"/>



    <!-- For App enumeration -->

    <queries>

        <intent>

            <action android:name="android.intent.action.SEND" />

            <data android:mimeType="*/*" />

        </intent>

        <intent>

            <action android:name="android.intent.action.SEND_MULTIPLE" />

            <data android:mimeType="*/*" />

        </intent>

        <intent>

            <action android:name="android.intent.action.VIEW" />

            <data android:mimeType="*/*" />

        </intent>

    </queries>



    <application

        android:name=".DocumentsApplication"

        android:label="@string/app_label"

res/layout/directory_app_bar.xml

+3 −10
Original line number Diff line number Diff line
@@ -38,13 +38,6 @@ 


        </androidx.core.widget.NestedScrollView>



        <View

            android:id="@+id/toolbar_background_layout"

            android:layout_width="match_parent"

            android:layout_height="@dimen/action_bar_space_height"

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

            app:layout_collapseMode="pin"/>



        <androidx.appcompat.widget.Toolbar

            android:id="@+id/toolbar"

            android:layout_width="match_parent"
@@ -53,7 +46,7 @@ 
            android:background="?android:attr/colorBackground"

            android:theme="?actionBarTheme"

            android:popupTheme="?actionBarPopupTheme"

            android:elevation="3dp"

            android:elevation="@dimen/search_bar_elevation"

            app:collapseContentDescription="@string/button_back"

            app:titleTextAppearance="@style/ToolbarTitle"

            app:layout_collapseMode="pin">

res/layout/directory_header.xml

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
    android:id="@+id/directory_header"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:layout_marginTop="@dimen/action_bar_space_margin"

    android:orientation="vertical">



    <com.android.documentsui.HorizontalBreadcrumb

res/layout/drawer_layout.xml

+4 −11
Original line number Diff line number Diff line
@@ -38,20 +38,13 @@ 
                android:layout_height="match_parent"

                app:layout_behavior="@string/scrolling_behavior">



                <LinearLayout

                    android:layout_width="match_parent"

                    android:layout_height="match_parent"

                    android:orientation="vertical">



                <FrameLayout

                    android:id="@+id/container_directory"

                    android:clipToPadding="false"

                    android:layout_width="match_parent"

                        android:layout_height="0dp"

                    android:layout_height="match_parent"

                    android:layout_weight="1" />



                </LinearLayout>



                <FrameLayout

                    android:id="@+id/container_search_fragment"

                    android:clipToPadding="false"

res/layout/fragment_pick.xml

+5 −5
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2014 The Android Open Source Project

<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2014 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.
@@ -47,6 +46,7 @@ 
        <!-- Handles touch events when button1 is disabled. -->

        <FrameLayout

            android:id="@+id/pick_button_overlay"

            android:importantForAccessibility="no"

            android:layout_width="match_parent"

            android:layout_height="match_parent" />