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

Commit 3a0c58ae authored by Evan Laird's avatar Evan Laird
Browse files

DO NOT MERGE Turn off LAYER_TYPE_SOFTWARE on BatteryMeterView 

We still need to save a layer for the BlendMode.CLEAR paint to do the
right thing. But with this we can save just the layer needed to draw the
battery instead of the whole battery meter view.

Test: visual
Bug: 130536257
Change-Id: I9d5844440250ccd9174e6c001e051c9adf62a2d0
(cherry picked from commit b4c703b8)
parent bac0795a

packages/SettingsLib/src/com/android/settingslib/graph/ThemedBatteryDrawable.kt

+2 −0
Original line number Diff line number Diff line
@@ -173,6 +173,7 @@ open class ThemedBatteryDrawable(private val context: Context, frameColor: Int) 
    }



    override fun draw(c: Canvas) {

        c.saveLayer(null, null)

        unifiedPath.reset()

        levelPath.reset()

        levelRect.set(fillRect)
@@ -243,6 +244,7 @@ open class ThemedBatteryDrawable(private val context: Context, frameColor: Int) 
            // And draw the plus sign on top of the fill

            c.drawPath(scaledPlus, errorPaint)

        }

        c.restore()

    }



    private fun batteryColorForLevel(level: Int): Int {

packages/SystemUI/src/com/android/systemui/BatteryMeterView.java

+0 −4
Original line number Diff line number Diff line
@@ -180,10 +180,6 @@ public class BatteryMeterView extends LinearLayout implements 
        setClipChildren(false);

        setClipToPadding(false);

        Dependency.get(ConfigurationController.class).observe(viewAttachLifecycle(this), this);



        // Needed for PorderDuff.Mode.CLEAR operations to work properly, but redraws don't happen

        // enough to justify a hardware layer.

        setLayerType(LAYER_TYPE_SOFTWARE, null);

    }



    private void setupLayoutTransition() {