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

Commit 185be3fd authored by Xin Li's avatar Xin Li
Browse files

Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) 

Bug: 166295507
Merged-In: I49c256b33345cc105a1fb610e217cb68bedb521d
Change-Id: I0567af7bf45612c4a333b1ed8a0aac361a65e6b1
parents 39189068 34584ceb

Android.bp

+39 −6
Original line number Diff line number Diff line
@@ -28,6 +28,10 @@ java_defaults { 
        "guava",

    ],



    libs: [

        "app-compat-annotations",

    ],



    privileged: true,



    certificate: "platform",
@@ -37,10 +41,16 @@ java_defaults { 
    },



    sdk_version: "system_current",

    min_sdk_version: "28",

    target_sdk_version: "28",

    min_sdk_version: "29",



    plugins: ["java_api_finder"],

    plugins: [

        "java_api_finder",

    ],

}



platform_compat_config {

    name: "documents-ui-compat-config",

    src: ":DocumentsUI",

}



filegroup {
@@ -61,7 +71,7 @@ java_library { 
genrule {

    name: "statslog-docsui-java-gen",

    tools: ["stats-log-api-gen"],

    cmd: "$(location stats-log-api-gen) --java $(out) --module docsui --javaPackage com.android.documentsui --javaClass DocumentsStatsLog",

    cmd: "$(location stats-log-api-gen) --java $(out) --module docsui --javaPackage com.android.documentsui --javaClass DocumentsStatsLog --supportQ",

    out: ["com/android/documentsui/DocumentsStatsLog.java"],

}
@@ -83,9 +93,30 @@ android_library { 
        "--auto-add-overlay",

    ],



    min_sdk_version: "28",

    target_sdk_version: "28",

    sdk_version: "system_current",

    min_sdk_version: "29",

}



android_library {

    name: "DocumentsUIUnitTests-res-lib",



    manifest: "AndroidManifestForUnitTests.xml",



    static_libs: [

        "androidx.appcompat_appcompat",

        "com.google.android.material_material",

    ],



    resource_dirs: [

        "res",

    ],



    aaptflags: [

        "--auto-add-overlay",

    ],



    sdk_version: "system_current",

    min_sdk_version: "29",

}



android_app {
@@ -104,4 +135,6 @@ android_app { 
    ],



    required: ["privapp_whitelist_com.android.documentsui"],



    min_sdk_version: "29",

}

AndroidManifest.xml

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

        package="com.android.documentsui">



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



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

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

    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
@@ -26,6 +28,28 @@ 
    <uses-permission android:name="android.permission.CACHE_CONTENT" />

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

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



    <!-- 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"
@@ -34,7 +58,8 @@ 
        android:supportsRtl="true"

        android:allowBackup="true"

        android:backupAgent=".prefs.BackupAgent"

        android:fullBackupOnly="false">

        android:fullBackupOnly="false"

        android:crossProfile="true">



        <meta-data

            android:name="com.google.android.backup.api_key"
@@ -42,16 +67,16 @@ 


        <activity

            android:name=".picker.PickActivity"

            android:theme="@style/DocumentsTheme"

            android:exported="true"

            android:theme="@style/LauncherTheme"

            android:visibleToInstantApps="true">

            <intent-filter>

            <intent-filter 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>

            <intent-filter 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" />
@@ -63,7 +88,7 @@ 
                <category android:name="android.intent.category.OPENABLE" />

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

            </intent-filter>

            <intent-filter>

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

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

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

            </intent-filter>
@@ -87,7 +112,6 @@ 
        <activity-alias

            android:name=".LauncherActivity"

            android:targetActivity=".files.LauncherActivity"

            android:enabled="@bool/is_launcher_enabled"

            android:label="@string/launcher_label"

            android:exported="true"

            android:icon="@drawable/launcher_icon" >
@@ -103,7 +127,7 @@ 
            android:name=".files.FilesActivity"

            android:documentLaunchMode="intoExisting"

            android:exported="true"

            android:theme="@style/DocumentsTheme">

            android:theme="@style/LauncherTheme">

            <intent-filter>

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

            </intent-filter>

AndroidManifestForUnitTests.xml

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

/*

 * Copyright (C) 2007-2017 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.

 */

-->

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

        package="com.android.documentsui">



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



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

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

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

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

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

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

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

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





</manifest>

TEST_MAPPING

0 → 100644
+8 −0
Original line number Diff line number Diff line 
{

  "postsubmit": [

    {

      "name": "DocumentsUIGoogleTests",

      "keywords": ["primary-device"]

    }

  ]

}

res/color/doc_list_item_subtitle_color.xml

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

<!--

  ~ Copyright (C) 2020 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.

  -->



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

    <item android:state_enabled="false"

        android:color="@color/doc_list_item_subtitle_disabled" />

    <item android:color="@color/doc_list_item_subtitle_enabled" />

</selector>