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

Unverified Commit 2183e804 authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'android-15.0.0_r6' into staging/lineage-22.0_merge-android-15.0.0_r6 

Android 15.0.0 Release 6 (AP4A.241205.013)

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZ1IssgAKCRDorT+BmrEO
# eLzRAJ4ozqAWU5UoHkV4ukKbtF8O+F3vTQCfdn4Cd9tupWeX8+SiZyW5HyVrmFE=
# =zUol
# -----END PGP SIGNATURE-----
# gpg: Signature made Fri Dec  6 00:44:02 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 2468 signatures in the past
#      3 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 Michel Comin Escude (13) and others
# Via Android (Google) Code Review (48) and others
* tag 'android-15.0.0_r6': (75 commits)
  Fix repeat color seed issue
  Do not cache default app icons when returned from PackageManager
  tracinglib: trace sections for coroutine scopes
  Removing unused keywords column from DB
  Ensure icons are invalidated when useNewIconForArchivedApps flag is flipped.
  Moving some utility class to IconCache to make it easier to use outside Launcher
  Adding kotlin support in iconLoaderLib
  Avoid redundant deps in view_capture
  Make #createIconBitmap public
  Adding a history log to the MSDL library.
  ViewCaptureAwareWindowManager - Add Factory interface
  Split the return animation framework flag into two.
  Make java_sdk_library dependencies explicit
  Fix for Top Dogfood Backup/Restore issue.
  Revert "Moving write secure settings permission to test manifest..."
  Make java_sdk_library dependencies explicit
  tracinglib: apply latest kt format style
  Moving write secure settings permission to test manifest for view capture lib.
  Reuse WeatherEffect in WeatherEffectFactory
  Add benchmark tests for coroutine tracing
  ...

Change-Id: Id9ff9987bb8e022d9e61bd939925e6be39a6b6dd
parents 2418fd27 8dfd750d

PREUPLOAD.cfg

+1 −1
Original line number Diff line number Diff line
@@ -12,4 +12,4 @@ checkstyle_hook = ${REPO_ROOT}/prebuilts/checkstyle/checkstyle.py --sha ${PREUPL 
ktlint_hook = ${REPO_ROOT}/prebuilts/ktlint/ktlint.py --no-verify-format -f ${PREUPLOAD_FILES}



[Tool Paths]

ktfmt = ${REPO_ROOT}/prebuilts/build-tools/common/framework/ktfmt.jar
 
ktfmt = ${REPO_ROOT}/external/ktfmt/ktfmt.sh

aconfig/systemui.aconfig

+28 −0
Original line number Diff line number Diff line
@@ -15,6 +15,13 @@ flag { 
    bug: "273205603"

}



flag {

    name: "return_animation_framework_long_lived"

    namespace: "systemui"

    description: "Turn on long-lived Return registrations in the Animation library"

    bug: "273205603"

}



flag {

    name: "shade_allow_back_gesture"

    namespace: "systemui"
@@ -41,3 +48,24 @@ flag { 
        purpose: PURPOSE_BUGFIX

    }

}



flag {

  name: "new_touchpad_gestures_tutorial"

  namespace: "systemui"

  description: "Enables new interactive tutorial for learning touchpad gestures"

  bug: "309928033"

}



flag {

    name: "three_button_corner_swipe"

    namespace: "systemui"

    description: "Allow the Assistant corner swipe gesture while in 3 button mode"

    bug: "361651619"

}



flag {

    name: "new_customization_picker_ui"

    namespace: "systemui"

    description: "Enables the BC25 design of the customization picker UI."

    bug: "339081035"

}

animationlib/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ android_library { 
android_library {

    name: "animationlib-tests-base",

    libs: [

        "android.test.base",

        "android.test.base.stubs.system",

        "androidx.test.core",

    ],

    static_libs: [

compilelib/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -44,4 +44,7 @@ java_library { 
            exclude_srcs: [":compilelib-ReleaseJavaFiles"],

        },

    },

    sdk_version: "31",

    min_sdk_version: "19",

    java_version: "17",

}

contextualeducationlib/Android.bp

0 → 100644
+29 −0
Original line number Diff line number Diff line 
// Copyright 2024 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.



package {

    default_team: "trendy_team_large_screen_experiences_sysui",

    default_applicable_licenses: ["Android-Apache-2.0"],

}



android_library {

    name: "contextualeducationlib",

    manifest: "AndroidManifest.xml",

    sdk_version: "system_current",

    min_sdk_version: "26",

    srcs: [

        "src/**/*.kt",

    ],

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

}