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

Unverified Commit c73597ab authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'android-14.0.0_r29' into staging/lineage-21.0_merge-android-14.0.0_r29 

Android 14.0.0 release 29

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZeZW2wAKCRDorT+BmrEO
# eD4FAKCGtyN5c4DrqiadSEAIYW5Y+4o/3QCeKQaK4QxOzlLZuVJW8P7SeDAa7CU=
# =FPLk
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue Mar  5 01:18:51 2024 EET
# gpg:                using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [marginal]
# gpg: initial-contribution@android.com: Verified 2345 signatures in the past
#      2 years.  Encrypted 4 messages in the past 2 years.
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 4340 D135 70EF 945E 8381  0964 E8AD 3F81 9AB1 0E78

# By Yein Jo (8) and others
# Via Automerger Merge Worker (282) and others
* tag 'android-14.0.0_r29': (48 commits)
  Revert^3 "Creating a custom drawable for user badge"
  Add EMPHASIZED_COMPLEMENT interpolator
  Add aconfig for Biometrics
  Adding some utility methods for testing
  Revert^2 "Creating a custom drawable for user badge"
  Use different context to unregisterComponentCallbacks in ViewCapture
  Reapply "Stop ViewCapture functionality if memory is low, Delete data"
  Revert "Stop ViewCapture functionality if memory is low, Delete data"
  Revert "Creating a custom drawable for user badge"
  Mark tracing companion methods as @JvmStatic
  Stop ViewCapture functionality if memory is low, Delete data
  Revert "Added a home panel dream shared flag"
  Reduce odex size by calling block inside traceSection only once
  Creating a custom drawable for user badge
  Updated home panel dream bug id
  Introduce utilities to log listener callbacks
  Added a home panel dream shared flag
  Fix duplicate class error
  Make saveWallpaper only being called when setWallpaper is clicked This version can save and load wallpaper with fixed names
  Add Utilities to trace flow values
  ...

Change-Id: Ie3d246a42af26bd01a8e02c7838e7d22df96483c
parents 31eb91c8 dc58c6d1

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
@@ -40,23 +40,52 @@ android_library { 
    platform_apis: false

}



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"

}