From b4c703b8e30e50fa451171be563c556704db5ef4 Mon Sep 17 00:00:00 2001 From: Evan Laird Date: Tue, 2 Apr 2019 12:56:00 -0400 Subject: [PATCH] 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 Change-Id: I9d5844440250ccd9174e6c001e051c9adf62a2d0 --- .../com/android/settingslib/graph/ThemedBatteryDrawable.kt | 2 ++ .../SystemUI/src/com/android/systemui/BatteryMeterView.java | 4 ---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/SettingsLib/src/com/android/settingslib/graph/ThemedBatteryDrawable.kt b/packages/SettingsLib/src/com/android/settingslib/graph/ThemedBatteryDrawable.kt index 1bb6c443f29b9..3f1da51fd46e6 100644 --- a/packages/SettingsLib/src/com/android/settingslib/graph/ThemedBatteryDrawable.kt +++ b/packages/SettingsLib/src/com/android/settingslib/graph/ThemedBatteryDrawable.kt @@ -172,6 +172,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) @@ -248,6 +249,7 @@ open class ThemedBatteryDrawable(private val context: Context, frameColor: Int) c.clipOutPath(scaledPlus) c.drawPath(scaledPlus, fillColorStrokeProtection) } + c.restore() } private fun batteryColorForLevel(level: Int): Int { diff --git a/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java b/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java index 62b0542bd7fe5..de64cf892da33 100644 --- a/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java +++ b/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java @@ -176,10 +176,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() {