diff options
| author | 2023-03-13 10:26:22 +0000 | |
|---|---|---|
| committer | 2023-03-13 10:26:22 +0000 | |
| commit | 6f39b5f9e9b451618e2cb4836027ca1e3e66efaa (patch) | |
| tree | 38c5d9fd2199ad170b3757bde406866fe467afa8 | |
| parent | 3568b128c13c57073dc95bb1e5df655c086db49e (diff) | |
| parent | 7a8592e923714632a805412080f0af207aa662e3 (diff) | |
Merge "Update status bar battery icon" into udc-dev
| -rw-r--r-- | packages/SettingsLib/res/values/arrays.xml | 2 | ||||
| -rw-r--r-- | packages/SettingsLib/res/values/colors.xml | 2 | ||||
| -rw-r--r-- | packages/SettingsLib/src/com/android/settingslib/graph/ThemedBatteryDrawable.kt | 11 |
3 files changed, 9 insertions, 6 deletions
diff --git a/packages/SettingsLib/res/values/arrays.xml b/packages/SettingsLib/res/values/arrays.xml index 502296029e23..3e2b800d5a2c 100644 --- a/packages/SettingsLib/res/values/arrays.xml +++ b/packages/SettingsLib/res/values/arrays.xml @@ -572,7 +572,7 @@ <!-- BatteryMeterView parameters --> <array name="batterymeter_color_levels"> - <item>15</item> + <item>20</item> <item>100</item> </array> <array name="batterymeter_color_values"> diff --git a/packages/SettingsLib/res/values/colors.xml b/packages/SettingsLib/res/values/colors.xml index 6b7e918ee5db..67139b510d85 100644 --- a/packages/SettingsLib/res/values/colors.xml +++ b/packages/SettingsLib/res/values/colors.xml @@ -43,4 +43,6 @@ <color name="qr_focused_corner_line_color">#ff1a73e8</color> <color name="qr_background_color">#b3ffffff</color> <!-- 70% white transparency --> <!-- End of QR code scanner colors --> + + <color name="batterymeter_saver_color">#FBBC04</color> </resources> diff --git a/packages/SettingsLib/src/com/android/settingslib/graph/ThemedBatteryDrawable.kt b/packages/SettingsLib/src/com/android/settingslib/graph/ThemedBatteryDrawable.kt index faea5b2c3e71..a03acc3a078c 100644 --- a/packages/SettingsLib/src/com/android/settingslib/graph/ThemedBatteryDrawable.kt +++ b/packages/SettingsLib/src/com/android/settingslib/graph/ThemedBatteryDrawable.kt @@ -135,7 +135,7 @@ open class ThemedBatteryDrawable(private val context: Context, frameColor: Int) } private val errorPaint = Paint(Paint.ANTI_ALIAS_FLAG).also { p -> - p.color = Utils.getColorStateListDefaultColor(context, R.color.batterymeter_plus_color) + p.color = Utils.getColorStateListDefaultColor(context, R.color.batterymeter_saver_color) p.alpha = 255 p.isDither = true p.strokeWidth = 0f @@ -244,10 +244,11 @@ open class ThemedBatteryDrawable(private val context: Context, frameColor: Int) c.drawPath(scaledBolt, fillColorStrokeProtection) } } else if (powerSaveEnabled) { - // If power save is enabled draw the perimeter path with colorError - c.drawPath(scaledErrorPerimeter, errorPaint) + // If power save is enabled draw the level path with colorError + c.drawPath(levelPath, errorPaint) // And draw the plus sign on top of the fill - c.drawPath(scaledPlus, errorPaint) + fillPaint.color = fillColor + c.drawPath(scaledPlus, fillPaint) } c.restore() } @@ -414,7 +415,7 @@ open class ThemedBatteryDrawable(private val context: Context, frameColor: Int) companion object { const val WIDTH = 12f const val HEIGHT = 20f - private const val CRITICAL_LEVEL = 15 + private const val CRITICAL_LEVEL = 20 // On a 12x20 grid, how wide to make the fill protection stroke. // Scales when our size changes private const val PROTECTION_STROKE_WIDTH = 3f |