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

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

Snap for 13054324 from 4bbd3a44 to 25Q2-release 

Change-Id: I9a34565c6b6889e77a059ac58f1b8ccc99b0d301
parents 6da4c11b 4bbd3a44

AndroidManifest.xml

+43 −5
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
<manifest xmlns:android="http://schemas.android.com/apk/res/android"

        package="com.android.documentsui">



    <uses-sdk android:minSdkVersion="29"/>

    <uses-sdk android:minSdkVersion="30"/>



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

    <uses-permission android:name="android.permission.REMOVE_TASKS" />
@@ -59,30 +59,68 @@ 
            android:name="com.google.android.backup.api_key"

            android:value="AEdPqrEAAAAInBA8ued0O_ZyYUsVhwinUF-x50NIe9K0GzBW4A" />



        <activity

            android:name=".picker.TrampolineActivity"

            android:exported="true"

            android:theme="@android:style/Theme.NoDisplay"

            android:featureFlag="com.android.documentsui.flags.redirect_get_content"

            android:visibleToInstantApps="true">

            <intent-filter android:priority="120">

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

                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="android.intent.category.OPENABLE" />

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

            </intent-filter>

            <intent-filter android:priority="120">

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

                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="android.intent.category.OPENABLE" />

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

            </intent-filter>

            <intent-filter android:priority="120">

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

                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="android.intent.category.OPENABLE" />

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

            </intent-filter>

            <intent-filter android:priority="120">

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

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

        </activity>



        <activity

            android:name=".picker.PickActivity"

            android:exported="true"

            android:theme="@style/LauncherTheme"

            android:visibleToInstantApps="true">

            <intent-filter android:priority="100">

            <intent-filter

                android:featureFlag="!com.android.documentsui.flags.redirect_get_content"

                android:priority="100">

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

                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="android.intent.category.OPENABLE" />

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

            </intent-filter>

            <intent-filter android:priority="100">

            <intent-filter

                android:featureFlag="!com.android.documentsui.flags.redirect_get_content"

                android:priority="100">

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

                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="android.intent.category.OPENABLE" />

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

            </intent-filter>

            <intent-filter android:priority="100">

            <intent-filter

                android:featureFlag="!com.android.documentsui.flags.redirect_get_content"

                android:priority="100">

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

                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="android.intent.category.OPENABLE" />

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

            </intent-filter>

            <intent-filter android:priority="100">

            <intent-filter

                android:featureFlag="!com.android.documentsui.flags.redirect_get_content"

                android:priority="100">

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

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

AndroidManifestLib.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
<manifest xmlns:android="http://schemas.android.com/apk/res/android"

        package="com.android.documentsui">



    <uses-sdk android:minSdkVersion="29" android:targetSdkVersion="29" />

    <uses-sdk android:minSdkVersion="30" android:targetSdkVersion="30" />



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

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

compose/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
<manifest xmlns:android="http://schemas.android.com/apk/res/android"

        package="com.android.documentsui.compose">



    <uses-sdk android:minSdkVersion="29"/>

    <uses-sdk android:minSdkVersion="30"/>



    <!-- Permissions copied from com.android.documentsui AndroidManifest.xml -->

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

flags.aconfig

+7 −0
Original line number Diff line number Diff line
@@ -51,3 +51,10 @@ flag { 
    description: "Redirects GET_CONTENT requests to Photopicker when appropriate"

    bug: "377771195"

}



flag {

    name: "use_peek_preview"

    namespace: "documentsui"

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

    bug: "373242058"

}

res/flag(com.android.documentsui.flags.use_material3)/drawable/main_container_bottom_section_background.xml

0 → 100644
+24 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2024 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.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

<shape xmlns:android="http://schemas.android.com/apk/res/android"

    android:shape="rectangle">

    <solid android:color="?attr/colorSurfaceBright" />

    <corners

        android:topLeftRadius="@dimen/main_container_corner_radius_small"

        android:topRightRadius="@dimen/main_container_corner_radius_small"

        android:bottomLeftRadius="@dimen/main_container_corner_radius_large"

        android:bottomRightRadius="@dimen/main_container_corner_radius_large" />

</shape>
 
 No newline at end of file