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

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

Merge tag 'android-15.0.0_r20' into staging/lineage-22.2_merge-android-15.0.0_r20 

Android 15.0.0 Release 20 (BP1A.250305.019)

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZ8epPgAKCRDorT+BmrEO
# eH2cAJ9iaQ5a8P3Er5Xfx/o7Gq93wb7gYwCdG1vdCAEdQ9NjGLxmNZoHCmGwtG0=
# =Ew1d
# -----END PGP SIGNATURE-----
# gpg: Signature made Wed Mar  5 03:30:38 2025 EET
# gpg:                using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [ultimate]

* tag 'android-15.0.0_r20': (94 commits)
  Update flag description
  Capitalize all `val`s in `companion object`s
  Add [GestureContext] #MotionMechanics
  Add query-logic to the [MotionSpec] #MotionMechanics
  Generalizing monochrome icon into theme icon
  viewcapture: guarantee happens-before relationship
  viewcapture: add if-tools team as OWNERS
  [MotionSpecBuilder] for the #MotionMechanics library
  Add the missing isVisible() that CinematicEngine uses.
  Moving ThemedIconDrawable to kotlin
  Run `mechanics_tests` in presubmit
  [MotionSpec] implementation for the #MotionMechanics library
  Remove closeable not found log from ViewCaptureAwareWindowManager.
  tracinglib: hide stack-walking behind debug flag
  Migrates Monet's Style Enum to @IntDef
  Add smartspace_sports_card_background flag.
  add flag for launcher icon shapes
  Initial commit for #MotionMechanics library
  Reapplying "Do not cache default app icons when re..."
  Revert "Update UserIconInfo to include LauncherUserInfo configs"
  ...

Change-Id: Ia46fc9af1c464453958247c219f4b77ec4b080bb
parents 03cb15b5 5fddbfb7

.gitignore

0 → 100644
+1 −0
Original line number Diff line number Diff line 
/weathereffects/graphics/build/

aconfig/systemui.aconfig

+25 −1
Original line number Diff line number Diff line
@@ -66,6 +66,30 @@ flag { 
flag {

    name: "new_customization_picker_ui"

    namespace: "systemui"

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

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

    bug: "339081035"

}



flag {

    name: "ambient_aod"

    namespace: "systemui"

    description: "Enables ambient wallpaper and AOD enhancements"

    bug: "372655702"

}



flag {

    name: "enable_launcher_icon_shapes"

    namespace: "systemui"

    description: "Enables launcher icon shapes customization"

    bug: "348708061"

}



flag {

    name: "smartspace_sports_card_background"

    namespace: "systemui"

    description: "Enables Smartspace sports card background protection and related ui updates"

    bug: "380285747"

    metadata {

         purpose: PURPOSE_BUGFIX

    }

}

animationlib/res/values/ids.xml

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

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

  -->

<resources>

    <!-- Animations -->

    <item type="id" name="ongoing_animation"/>

</resources>

tracinglib/demo/src/com/android/app/tracing/demo/experiments/NestedLaunchesWithoutName.kt→animationlib/src/com/android/app/animation/Animations.kt

+42 −0
Original line number Diff line number Diff line
@@ -13,34 +13,30 @@ 
 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

package com.android.app.tracing.demo.experiments



import com.android.app.tracing.demo.FixedThread1

import com.android.app.tracing.demo.FixedThread2

import javax.inject.Inject

import javax.inject.Singleton

import kotlin.coroutines.CoroutineContext

import kotlinx.coroutines.coroutineScope

import kotlinx.coroutines.delay

import kotlinx.coroutines.launch

package com.android.app.animation



@Singleton

class NestedLaunchesWithoutName

@Inject

constructor(

    @FixedThread1 private var fixedThreadContext1: CoroutineContext,

    @FixedThread2 private var fixedThreadContext2: CoroutineContext,

) : Experiment {

    override fun getDescription(): String =

        "Nested launches in which only the leaf uses a trace name"

import android.animation.Animator

import android.view.View



    override suspend fun run(): Unit = coroutineScope {

        launch(fixedThreadContext1) {

            delay(10)

            launch(fixedThreadContext2) {

                delay(10)

                launch(fixedThreadContext1) { incSlowly() }

/** A static class for general animation-related utilities. */

class Animations {

    companion object {

        /** Stores a [view]'s ongoing [animation] so it can be cancelled if needed. */

        @JvmStatic

        fun setOngoingAnimation(view: View, animation: Animator?) {

            cancelOngoingAnimation(view)

            view.setTag(R.id.ongoing_animation, animation)

        }



        /**

         * Cancels the ongoing animation affecting a [view], if any was previously stored using

         * [setOngoingAnimation].

         */

        @JvmStatic

        fun cancelOngoingAnimation(view: View) {

            (view.getTag(R.id.ongoing_animation) as? Animator)?.cancel()

            view.setTag(R.id.ongoing_animation, null)

        }

    }

}

animationlib/tests/robolectric/config/robolectric.properties

+0 −1
Original line number Diff line number Diff line 
sdk=NEWEST_SDK
 
shadows=com.android.app.animation.robolectric.ShadowAnimationUtils2