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

Commit 8990ce7b authored by Xin Li's avatar Xin Li
Browse files

DO NOT MERGE - Merge Android 13 

Bug: 242648940
Merged-In: I351a2dfae53e3bd5e32d484acc3504bf7f48b76d
Change-Id: I2a2bb22e28a0ba74c8fc8d644ab3b3e47def386f
parents 9f11d003 063fc9b1

Android.bp

+8 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ java_defaults { 
        "apache-commons-compress",

        "com.google.android.material_material",

        "guava",

        "modules-utils-build_system",

    ],



    libs: [
@@ -62,6 +63,7 @@ java_defaults { 
    plugins: [

        "java_api_finder",

    ],

    lint: { strict_updatability_linting: true }

}



platform_compat_config {
@@ -82,6 +84,7 @@ java_library { 
    srcs: [

        ":statslog-docsui-java-gen",

    ],

    lint: { strict_updatability_linting: true }

}



genrule {
@@ -113,6 +116,7 @@ android_library { 
    sdk_version: "system_current",

    target_sdk_version: "30",

    min_sdk_version: "29",

    lint: { strict_updatability_linting: true }

}



android_library {
@@ -123,6 +127,7 @@ android_library { 
    static_libs: [

        "androidx.appcompat_appcompat",

        "com.google.android.material_material",

        "modules-utils-build_system",

    ],



    resource_dirs: [
@@ -141,6 +146,7 @@ android_library { 
    sdk_version: "system_current",

    target_sdk_version: "30",

    min_sdk_version: "29",

    lint: { strict_updatability_linting: true }

}



android_app {
@@ -167,4 +173,6 @@ android_app { 


    target_sdk_version: "30",

    min_sdk_version: "29",

    lint: { strict_updatability_linting: true }

}

AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
    <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" />

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



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

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

TEST_MAPPING

+9 −0
Original line number Diff line number Diff line 
{

  "presubmit": [

    {

      "name": "DocumentsUIGoogleTests",

      "keywords": ["primary-device"]

    },

    {

      "name": "DocumentsUIUnitTests"

    }

  ],

  "postsubmit": [

    {

      "name": "DocumentsUIGoogleTests",

app-perf-tests/src/com/android/documentsui/FilesAppPerfTest.java

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ public class FilesAppPerfTest { 
        final Bundle status = new Bundle();

        Arrays.sort(measurements);

        final long median = measurements[NUM_MEASUREMENTS / 2 - 1];

        status.putDouble(key, median);

        status.putDouble(key + "(ms)", median);



        InstrumentationRegistry.getInstrumentation().sendStatus(Activity.RESULT_OK, status);

    }

res/color/fragment_pick_button_background_color.xml

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

  Copyright 2018 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



      https://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:color="@color/fragment_pick_active_button_color" android:state_enabled="true" />

  <item android:color="@color/fragment_pick_inactive_button_color" android:state_enabled="false" />

</selector>
 
 No newline at end of file