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

Commit 9e2b7eff authored by Xin Li's avatar Xin Li
Browse files

Merge Android 24Q2 Release (ab/11526283) to aosp-main-future 

Bug: 337098550
Merged-In: I92230d0574f58970aa32bb7c5d493af32dc1b40f
Change-Id: I5561dcb39b36b5080de7f84ab4134ad77ab0911d
parents 4aa3bc09 2176df2e

PREUPLOAD.cfg

0 → 100644
+12 −0
Original line number Diff line number Diff line 
[Builtin Hooks]

bpfmt = true



[Builtin Hooks Options]

bpfmt = -d



[Hook Scripts]

checkstyle_hook = ${REPO_ROOT}/prebuilts/checkstyle/checkstyle.py --sha ${PREUPLOAD_COMMIT}



ktfmt_hook = ${REPO_ROOT}/external/ktfmt/ktfmt.py --check -i ${REPO_ROOT}/frameworks/libs/systemui/ktfmt_includes.txt ${PREUPLOAD_FILES}



ktlint_hook = ${REPO_ROOT}/prebuilts/ktlint/ktlint.py --no-verify-format -f ${PREUPLOAD_FILES}

aconfig/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
package {

    default_visibility: [

        "//visibility:public",

    ]

    ],

}



aconfig_declarations {

aconfig/systemui.aconfig

+24 −0
Original line number Diff line number Diff line
@@ -7,3 +7,27 @@ flag { 
    description: "An Example Flag"

    bug: "308482106"

}



flag {

    name: "return_animation_framework_library"

    namespace: "systemui"

    description: "Turn on Return functionality in the Animation library"

    bug: "273205603"

}



flag {

    name: "shade_allow_back_gesture"

    namespace: "systemui"

    description: "Allow Back Gestures in Shade"

    bug: "309545085"

}



flag {

    name: "enable_home_delay"

    namespace: "systemui"

    description: "Enables fix that exposes signal to notify the completion of the RRO loading."

    bug: "307507412"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}

iconloaderlib/res/drawable/ic_clone_app_badge.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
    android:height="@dimen/profile_badge_size"

    android:viewportWidth="24"

    android:viewportHeight="24"

    android:tint="#ff3C4043">

    android:tint="@color/badge_tint_clone">



    <group android:scaleX=".6" android:scaleY=".6" android:pivotX="12" android:pivotY="12">

      <path

iconloaderlib/res/drawable/ic_instant_app_badge.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
    android:height="@dimen/profile_badge_size"

    android:viewportWidth="18"

    android:viewportHeight="18"

    android:tint="@android:color/black">

    android:tint="@color/badge_tint_instant">



    <path

        android:fillColor="#FFFFFFFF"