Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "DO NOT MERGE Turn off LAYER_TYPE_SOFTWARE on BatteryMeterView" into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-04-15 14:36:46 +00:00
committed by Android (Google) Code Review
parent e299aa4ea4 3a0c58ae57
commit eb24d06f8d
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SettingsLib/src/com/android/settingslib/graph/ThemedBatteryDrawable.kt
View File

@@ -173,6 +173,7 @@ open class ThemedBatteryDrawable(private val context: Context, frameColor: Int)
} }
override fun draw(c: Canvas) { override fun draw(c: Canvas) {
c.saveLayer(null, null)
unifiedPath.reset() unifiedPath.reset()
levelPath.reset() levelPath.reset()
levelRect.set(fillRect) 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 // And draw the plus sign on top of the fill
c.drawPath(scaledPlus, errorPaint) c.drawPath(scaledPlus, errorPaint)
} }
c.restore()
} }
private fun batteryColorForLevel(level: Int): Int { private fun batteryColorForLevel(level: Int): Int {

4
packages/SystemUI/src/com/android/systemui/BatteryMeterView.java
View File

@@ -180,10 +180,6 @@ public class BatteryMeterView extends LinearLayout implements
setClipChildren(false); setClipChildren(false);
setClipToPadding(false); setClipToPadding(false);
Dependency.get(ConfigurationController.class).observe(viewAttachLifecycle(this), this); 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() { private void setupLayoutTransition() {