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

Commit b62600b8 authored by Xin Li's avatar Xin Li Committed by Gerrit Code Review
Browse files

Merge "DO NOT MERGE - Merge Android 13"

parents 42b28953 79fabd30

Android.bp

+21 −0
Original line number Diff line number Diff line
@@ -31,11 +31,13 @@ android_library { 
        "androidx.test.uiautomator_uiautomator",

        "androidx.preference_preference",

        "SystemUISharedLib",

        "SystemUIAnimationLib",

    ],

    srcs: [

        "tests/tapl/**/*.java",

        "src/com/android/launcher3/ResourceUtils.java",

        "src/com/android/launcher3/testing/TestProtocol.java",

        "src/com/android/launcher3/testing/*Request.java",

    ],

    resource_dirs: [ ],

    manifest: "tests/tapl/AndroidManifest.xml",
@@ -195,6 +197,7 @@ android_library { 
        "lottie",

        "SystemUISharedLib",

        "SystemUI-statsd",

        "SystemUIAnimationLib",

    ],

    manifest: "quickstep/AndroidManifest.xml",

    min_sdk_version: "current",
@@ -207,6 +210,8 @@ filegroup { 
    srcs: [

        "ext_tests/src/**/*.java",

        "ext_tests/src/**/*.kt",

        "quickstep/ext_tests/src/**/*.java",

        "quickstep/ext_tests/src/**/*.kt",

    ],

}
@@ -223,6 +228,19 @@ filegroup { 
    ],

}



// Common source files used to build go launcher except go/src files

filegroup {

    name: "launcher-go-src-no-build-config",

    srcs: [

        "src/**/*.java",

        "src/**/*.kt",

        "quickstep/src/**/*.java",

        "quickstep/src/**/*.kt",

        "go/quickstep/src/**/*.java",

        "go/quickstep/src/**/*.kt",

    ],

}



// Proguard files for Launcher3

filegroup {

    name: "launcher-proguard-rules",
@@ -253,7 +271,9 @@ android_library { 
    static_libs: [

        "Launcher3CommonDepsLib",

        "QuickstepResLib",

        "androidx.room_room-runtime",

    ],

    plugins: ["androidx.room_room-compiler-plugin"],

    manifest: "quickstep/AndroidManifest-launcher.xml",

    additional_manifests: [

        "go/AndroidManifest.xml",
@@ -284,6 +304,7 @@ android_library { 
        "SystemUISharedLib",

        "Launcher3CommonDepsLib",

        "QuickstepResLib",

        "SystemUIAnimationLib",

    ],

    manifest: "quickstep/AndroidManifest.xml",

    platform_apis: true,

AndroidManifest-common.xml

+1 −2
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ 
    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />

    <!-- for rotating surface by arbitrary degree -->

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

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

    

    <!--

    Permissions required for read/write access to the workspace data. These permission name
@@ -50,13 +51,11 @@ 
    -->

    <permission

        android:name="${packageName}.permission.READ_SETTINGS"

        android:permissionGroup="android.permission-group.SYSTEM_TOOLS"

        android:protectionLevel="signatureOrSystem"

        android:label="@string/permlab_read_settings"

        android:description="@string/permdesc_read_settings"/>

    <permission

        android:name="${packageName}.permission.WRITE_SETTINGS"

        android:permissionGroup="android.permission-group.SYSTEM_TOOLS"

        android:protectionLevel="signatureOrSystem"

        android:label="@string/permlab_write_settings"

        android:description="@string/permdesc_write_settings"/>

AndroidManifest.xml

+2 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
<manifest

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

    package="com.android.launcher3">

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

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

    <!--

    Manifest entries specific to Launcher3. This is merged with AndroidManifest-common.xml.

    Refer comments around specific entries on how to extend individual components.
@@ -58,6 +58,7 @@ 
            android:enabled="true">

            <intent-filter>

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

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

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

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

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

OWNERS

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ peanutbutter@google.com 
xuqiu@google.com

sreyasr@google.com

thiruram@google.com

brianji@google.com



per-file FeatureFlags.java, globs = set noparent

per-file FeatureFlags.java = sunnygoyal@google.com, winsonc@google.com, zakcohen@google.com, mrcasey@google.com, adamcohen@google.com, hyunyoungs@google.com

build.gradle

+1 −1
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ dependencies { 
protobuf {

    // Configure the protoc executable

    protoc {

        artifact = "com.google.protobuf:protoc:${protocVersion}"

        artifact = "com.google.protobuf:protoc:${protocVersion}${PROTO_ARCH_SUFFIX}"

    }

    generateProtoTasks {

        all().each { task ->