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

Commit 4f37bf0b authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 13838736 from c6e69b2e to 25Q4-release 

Change-Id: I1026c2676fc7172b2ecf76925f5f010227c52ca4
parents 3e19c808 c6e69b2e

displaylib/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package { 


java_library {

    name: "displaylib",

    manifest: "AndroidManifest.xml",

    static_libs: [

        "kotlinx_coroutines_android",

        "dagger2",

displaylib/AndroidManifest.xml

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

<!--

     Copyright 2025 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.

-->



<manifest xmlns:android="http://schemas.android.com/apk/res/android"

    package="com.android.app.displaylib">

</manifest>

iconloaderlib/src/com/android/launcher3/icons/BitmapInfo.kt

+7 −2
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ data class BitmapInfo( 
    )

    internal annotation class BitmapInfoFlags



    @IntDef(flag = true, value = [FLAG_THEMED, FLAG_NO_BADGE, FLAG_SKIP_USER_BADGE])

    @IntDef(flag = true, value = [FLAG_THEMED, FLAG_NO_BADGE, FLAG_SKIP_USER_BADGE, FLAG_CUSTOM_SHAPE])

    annotation class DrawableCreationFlags



    fun withBadgeInfo(badgeInfo: BitmapInfo?) = copy(badgeInfo = badgeInfo)
@@ -104,7 +104,11 @@ data class BitmapInfo( 
                    else -> delegateFactory

                },

            disabledAlpha = GraphicsUtils.getFloat(context, R.attr.disabledIconAlpha, 1f),

            creationFlags = creationFlags,

            creationFlags = if (iconShape != null) {

                creationFlags.or(FLAG_CUSTOM_SHAPE)

            } else {

                creationFlags

            },

            badge =

                if (!creationFlags.hasMask(FLAG_NO_BADGE)) {

                    getBadgeDrawable(
@@ -211,6 +215,7 @@ data class BitmapInfo( 
        const val FLAG_THEMED: Int = 1 shl 0

        const val FLAG_NO_BADGE: Int = 1 shl 1

        const val FLAG_SKIP_USER_BADGE: Int = 1 shl 2

        const val FLAG_CUSTOM_SHAPE: Int = 1 shl 3



        @JvmField val LOW_RES_ICON: Bitmap = Bitmap.createBitmap(1, 1, Bitmap.Config.ALPHA_8)

        @JvmField val LOW_RES_INFO: BitmapInfo = fromBitmap(LOW_RES_ICON)