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

Commit c67522ec authored by Mady Mellor's avatar Mady Mellor Committed by Android (Google) Code Review
Browse files

Merge "Avoid a bitmap error in robolectric tests & fix a small UI flaw" into main

parents 806ee1e3 ce600b22

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleOverflow.kt

+3 −2
Original line number Original line Diff line number Diff line
@@ -137,14 +137,15 @@ class BubbleOverflow(private val context: Context, private val positioner: Bubbl 
        // Update bitmap

        // Update bitmap

        val fg = InsetDrawable(overflowBtn?.iconDrawable, overflowIconInset)

        val fg = InsetDrawable(overflowBtn?.iconDrawable, overflowIconInset)

        val drawable = AdaptiveIconDrawable(ColorDrawable(colorAccent), fg)

        val drawable = AdaptiveIconDrawable(ColorDrawable(colorAccent), fg)

        bitmap = iconFactory.createBadgedIconBitmap(drawable).icon

        val bubbleBitmapScale = FloatArray(1)

        bitmap = iconFactory.getBubbleBitmap(drawable, bubbleBitmapScale)





        // Update dot path

        // Update dot path

        dotPath =

        dotPath =

            PathParser.createPathFromPathData(

            PathParser.createPathFromPathData(

                res.getString(com.android.internal.R.string.config_icon_mask)

                res.getString(com.android.internal.R.string.config_icon_mask)

            )

            )

        val scale = iconFactory.normalizer.getScale(iconView!!.iconDrawable)

        val scale = bubbleBitmapScale[0]

        val radius = BadgedImageView.DEFAULT_PATH_SIZE / 2f

        val radius = BadgedImageView.DEFAULT_PATH_SIZE / 2f

        val matrix = Matrix()

        val matrix = Matrix()

        matrix.setScale(

        matrix.setScale(