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

Commit 20d38f57 authored by Xin Li's avatar Xin Li
Browse files

Merge Android 14 QPR2 to AOSP main 

Bug: 319669529
Merged-In: I34cfad83c8c9878894bc7e5d0c2acaf2796c7861
Change-Id: Iffa25c40f74c7c541ddb39ba709cb110ca5be630
parents 403fa809 276c2d44

aconfig/Android.bp

0 → 100644
+39 −0
Original line number Diff line number Diff line 
//

// Copyright (C) 2023 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.

//



/*****

 * These flags are meant for SystemUI-owned flags that can be read by non-systemui

 * processes.

 */



package {

    default_visibility: [

        "//visibility:public",

    ]

}



aconfig_declarations {

    name: "com_android_systemui_shared_flags",

    package: "com.android.systemui.shared",

    srcs: [

        "*.aconfig",

    ],

}



java_aconfig_library {

    name: "com_android_systemui_shared_flags_lib",

    aconfig_declarations: "com_android_systemui_shared_flags",

}

aconfig/biometrics.aconfig

0 → 100644
+10 −0
Original line number Diff line number Diff line 
package: "com.android.systemui.shared"



# Note: for shared flags across SystemUI & framework



flag {

    name: "sidefps_controller_refactor"

    namespace: "biometrics_framework"

    description: "flag for SideFpsController refactor"

    bug: "288175061"

}

aconfig/systemui.aconfig

0 → 100644
+8 −0
Original line number Diff line number Diff line 
package: "com.android.systemui.shared"



flag {

    name: "example_shared_flag"

    namespace: "systemui"

    description: "An Example Flag"

    bug: "308482106"

}

animationlib/Android.bp

+37 −8
Original line number Diff line number Diff line
@@ -37,23 +37,52 @@ android_library { 
    kotlincflags: ["-Xjvm-default=all"],

}



android_test {

    name: "animationlib_tests",

    manifest: "tests/AndroidManifest.xml",



android_library {

    name: "animationlib-tests-base",

    libs: [

        "android.test.base",

        "androidx.test.core",

    ],

    static_libs: [

        "animationlib",

        "androidx.test.ext.junit",

        "androidx.test.rules",

        "testables",

    ]

}



android_app {

    name: "TestAnimationLibApp",

    platform_apis: true,

    static_libs: [

        "animationlib-tests-base",

    ]

}



android_robolectric_test {

    enabled: true,

    name: "animationlib_robo_tests",

    srcs: [

        "tests/src/**/*.kt",

        "tests/robolectric/src/**/*.kt"

    ],

    libs: [

        "android.test.base",

    java_resource_dirs: ["tests/robolectric/config"],

    instrumentation_for: "TestAnimationLibApp",

    upstream: true,

}



android_test {

    name: "animationlib_tests",

    manifest: "tests/AndroidManifest.xml",



    static_libs: [

        "animationlib-tests-base",

    ],

    srcs: [

        "**/*.java",

        "**/*.kt"

        "tests/src/**/*.java",

        "tests/src/**/*.kt"

    ],

    kotlincflags: ["-Xjvm-default=all"],

    test_suites: ["general-tests"],

}

animationlib/build.gradle

+2 −7
Original line number Diff line number Diff line
@@ -15,16 +15,10 @@ android { 
            manifest.srcFile 'AndroidManifest.xml'

        }

        androidTest {

            java.srcDirs = ["tests/src"]

            java.srcDirs = ["tests/src", "tests/robolectric/src"]

            manifest.srcFile 'tests/AndroidManifest.xml'

        }

    }

    compileSdk 33



    defaultConfig {

        minSdk 33

        targetSdk 33

    }



    lintOptions {

        abortOnError false
@@ -43,6 +37,7 @@ dependencies { 
    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0"

    implementation "androidx.core:core-animation:1.0.0-alpha02"

    implementation "androidx.core:core-ktx:1.9.0"

    androidTestImplementation libs.robolectric

    androidTestImplementation "androidx.test.ext:junit:1.1.3"

    androidTestImplementation "androidx.test:rules:1.4.0"

}