SystemUI: Bring back good ol' circle battery style (3b0f5b85) · Commits · e / os / android_frameworks_base

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

0 → 100644

+322 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2017 The Android Open Source Project
		* Copyright (C) 2019 The LineageOS Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/
		package com.android.settingslib.graph

		import android.content.Context
		import android.content.res.Resources
		import android.graphics.*
		import android.graphics.drawable.Drawable
		import android.util.TypedValue
		import com.android.settingslib.R
		import com.android.settingslib.Utils
		import kotlin.math.max
		import kotlin.math.min

		class CircleBatteryDrawable(private val context: Context, frameColor: Int) : Drawable() {
		private val criticalLevel: Int
		private val warningString: String
		private val framePaint: Paint
		private val batteryPaint: Paint
		private val warningTextPaint: Paint
		private val textPaint: Paint
		private val boltPaint: Paint
		private val plusPaint: Paint
		private val powerSavePaint: Paint
		private val colors: IntArray
		private val boltPoints: FloatArray
		private val boltPath = Path()
		private val padding = Rect()
		private val frame = RectF()
		private val boltFrame = RectF()

		private var chargeColor: Int
		private var iconTint = Color.WHITE
		private var intrinsicWidth: Int
		private var intrinsicHeight: Int
		private var height = 0
		private var width = 0

		// Dual tone implies that battery level is a clipped overlay over top of the whole shape
		private var dualTone = false

		override fun getIntrinsicHeight() = intrinsicHeight

		override fun getIntrinsicWidth() = intrinsicWidth

		var charging = false
		set(value) {
		field = value
		postInvalidate()
		}

		var powerSaveEnabled = false
		set(value) {
		field = value
		postInvalidate()
		}

		var showPercent = false
		set(value) {
		field = value
		postInvalidate()
		}

		var batteryLevel = -1
		set(value) {
		field = value
		postInvalidate()
		}

		// an approximation of View.postInvalidate()
		private fun postInvalidate() {
		unscheduleSelf { invalidateSelf() }
		scheduleSelf({ invalidateSelf() }, 0)
		}

		override fun setBounds(left: Int, top: Int, right: Int, bottom: Int) {
		super.setBounds(left, top, right, bottom)
		updateSize()
		}

		private fun updateSize() {
		val res = context.resources
		height = bounds.bottom - padding.bottom - (bounds.top + padding.top)
		width = bounds.right - padding.right - (bounds.left + padding.left)
		warningTextPaint.textSize = height * 0.75f
		intrinsicHeight = res.getDimensionPixelSize(R.dimen.battery_height)
		intrinsicWidth = res.getDimensionPixelSize(R.dimen.battery_height)
		}

		override fun getPadding(padding: Rect): Boolean {
		if (this.padding.left == 0 &&
		this.padding.top == 0 &&
		this.padding.right == 0 &&
		this.padding.bottom == 0
		) {
		return super.getPadding(padding)
		}
		padding.set(this.padding)
		return true
		}

		private fun getColorForLevel(percent: Int): Int {
		var thresh: Int
		var color = 0
		var i = 0
		while (i < colors.size) {
		thresh = colors[i]
		color = colors[i + 1]
		if (percent <= thresh) {
		// Respect tinting for "normal" level
		return if (i == colors.size - 2) {
		iconTint
		} else {
		color
		}
		}
		i += 2
		}
		return color
		}

		private fun batteryColorForLevel(level: Int) =
		if (charging \|\| powerSaveEnabled)
		chargeColor
		else
		getColorForLevel(level)

		fun setColors(fgColor: Int, bgColor: Int, singleToneColor: Int) {
		val fillColor = if (dualTone) fgColor else singleToneColor

		iconTint = fillColor
		framePaint.color = bgColor
		boltPaint.color = fillColor
		chargeColor = fillColor

		invalidateSelf()
		}

		override fun draw(c: Canvas) {
		if (batteryLevel == -1) return
		val circleSize = min(width, height)
		val strokeWidth = circleSize / 6.5f
		framePaint.strokeWidth = strokeWidth
		framePaint.style = Paint.Style.STROKE
		batteryPaint.strokeWidth = strokeWidth
		batteryPaint.style = Paint.Style.STROKE
		powerSavePaint.strokeWidth = strokeWidth
		frame[
		strokeWidth / 2.0f + padding.left, strokeWidth / 2.0f,
		circleSize - strokeWidth / 2.0f + padding.left
		] = circleSize - strokeWidth / 2.0f
		// set the battery charging color
		batteryPaint.color = batteryColorForLevel(batteryLevel)
		if (charging) { // define the bolt shape
		val bl = frame.left + frame.width() / 3.0f
		val bt = frame.top + frame.height() / 3.4f
		val br = frame.right - frame.width() / 4.0f
		val bb = frame.bottom - frame.height() / 5.6f
		if (boltFrame.left != bl \|\|
		boltFrame.top != bt \|\|
		boltFrame.right != br \|\|
		boltFrame.bottom != bb
		) {
		boltFrame[bl, bt, br] = bb
		boltPath.reset()
		boltPath.moveTo(
		boltFrame.left + boltPoints[0] * boltFrame.width(),
		boltFrame.top + boltPoints[1] * boltFrame.height()
		)
		var i = 2
		while (i < boltPoints.size) {
		boltPath.lineTo(
		boltFrame.left + boltPoints[i] * boltFrame.width(),
		boltFrame.top + boltPoints[i + 1] * boltFrame.height()
		)
		i += 2
		}
		boltPath.lineTo(
		boltFrame.left + boltPoints[0] * boltFrame.width(),
		boltFrame.top + boltPoints[1] * boltFrame.height()
		)
		}
		c.drawPath(boltPath, boltPaint)
		}
		// draw thin gray ring first
		c.drawArc(frame, 270f, 360f, false, framePaint)
		// draw colored arc representing charge level
		if (batteryLevel > 0) {
		if (!charging && powerSaveEnabled) {
		c.drawArc(frame, 270f, 3.6f * batteryLevel, false, powerSavePaint)
		} else {
		c.drawArc(frame, 270f, 3.6f * batteryLevel, false, batteryPaint)
		}
		}
		// compute percentage text
		if (!charging && batteryLevel != 100 && showPercent) {
		textPaint.color = getColorForLevel(batteryLevel)
		textPaint.textSize = height * 0.52f
		val textHeight = -textPaint.fontMetrics.ascent
		val pctText =
		if (batteryLevel > criticalLevel)
		batteryLevel.toString()
		else
		warningString
		val pctX = width * 0.5f
		val pctY = (height + textHeight) * 0.47f
		c.drawText(pctText, pctX, pctY, textPaint)
		}
		}

		// Some stuff required by Drawable.
		override fun setAlpha(alpha: Int) {}

		override fun setColorFilter(colorFilter: ColorFilter?) {
		framePaint.colorFilter = colorFilter
		batteryPaint.colorFilter = colorFilter
		warningTextPaint.colorFilter = colorFilter
		boltPaint.colorFilter = colorFilter
		plusPaint.colorFilter = colorFilter
		}

		override fun getOpacity() = PixelFormat.UNKNOWN

		companion object {
		private fun loadPoints(
		res: Resources,
		pointArrayRes: Int
		): FloatArray {
		val pts = res.getIntArray(pointArrayRes)
		var maxX = 0
		var maxY = 0
		run {
		var i = 0
		while (i < pts.size) {
		maxX = max(maxX, pts[i])
		maxY = max(maxY, pts[i + 1])
		i += 2
		}
		}
		val ptsF = FloatArray(pts.size)
		var i = 0
		while (i < pts.size) {
		ptsF[i] = pts[i].toFloat() / maxX
		ptsF[i + 1] = pts[i + 1].toFloat() / maxY
		i += 2
		}
		return ptsF
		}
		}

		init {
		val res = context.resources
		val color_levels = res.obtainTypedArray(R.array.batterymeter_color_levels)
		val color_values = res.obtainTypedArray(R.array.batterymeter_color_values)
		colors = IntArray(2 * color_levels.length())
		for (i in 0 until color_levels.length()) {
		colors[2 * i] = color_levels.getInt(i, 0)
		if (color_values.getType(i) == TypedValue.TYPE_ATTRIBUTE) {
		colors[2 * i + 1] = Utils.getColorAttrDefaultColor(
		context,
		color_values.getThemeAttributeId(i, 0)
		)
		} else {
		colors[2 * i + 1] = color_values.getColor(i, 0)
		}
		}
		color_levels.recycle()
		color_values.recycle()
		warningString = res.getString(R.string.battery_meter_very_low_overlay_symbol)
		criticalLevel = res.getInteger(
		com.android.internal.R.integer.config_criticalBatteryWarningLevel
		)
		framePaint = Paint(Paint.ANTI_ALIAS_FLAG)
		framePaint.color = frameColor
		framePaint.isDither = true
		batteryPaint = Paint(Paint.ANTI_ALIAS_FLAG)
		batteryPaint.isDither = true
		textPaint = Paint(Paint.ANTI_ALIAS_FLAG)
		textPaint.typeface = Typeface.create("sans-serif-condensed", Typeface.BOLD)
		textPaint.textAlign = Paint.Align.CENTER
		warningTextPaint = Paint(Paint.ANTI_ALIAS_FLAG)
		warningTextPaint.typeface = Typeface.create("sans-serif", Typeface.BOLD)
		warningTextPaint.textAlign = Paint.Align.CENTER
		if (colors.size > 1) {
		warningTextPaint.color = colors[1]
		}
		chargeColor = Utils.getColorStateListDefaultColor(context, R.color.meter_consumed_color)
		boltPaint = Paint(Paint.ANTI_ALIAS_FLAG)
		boltPaint.color = Utils.getColorStateListDefaultColor(
		context,
		R.color.batterymeter_bolt_color
		)
		boltPoints =
		loadPoints(res, R.array.batterymeter_bolt_points)
		plusPaint = Paint(Paint.ANTI_ALIAS_FLAG)
		plusPaint.color = Utils.getColorStateListDefaultColor(
		context,
		R.color.batterymeter_plus_color
		)
		powerSavePaint = Paint(Paint.ANTI_ALIAS_FLAG)
		powerSavePaint.color = plusPaint.color
		powerSavePaint.style = Paint.Style.STROKE
		intrinsicWidth = res.getDimensionPixelSize(R.dimen.battery_width)
		intrinsicHeight = res.getDimensionPixelSize(R.dimen.battery_height)

		dualTone = res.getBoolean(com.android.internal.R.bool.config_batterymeterDualTone)
		}
		}

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

+31 −0

Original line number	Diff line number	Diff line
		@@ -25,6 +25,7 @@ import android.graphics.Path
		import android.graphics.PixelFormat
		import android.graphics.Rect
		import android.graphics.RectF
		import android.graphics.Typeface
		import android.graphics.drawable.Drawable
		import android.util.PathParser
		import android.util.TypedValue
		@@ -106,6 +107,12 @@ open class ThemedBatteryDrawable(private val context: Context, frameColor: Int)
		postInvalidate()
		}

		var showPercent = false
		set(value) {
		field = value
		postInvalidate()
		}

		private val fillColorStrokePaint = Paint(Paint.ANTI_ALIAS_FLAG).also { p ->
		p.color = frameColor
		p.alpha = 255
		@@ -152,6 +159,11 @@ open class ThemedBatteryDrawable(private val context: Context, frameColor: Int)
		p.style = Paint.Style.FILL_AND_STROKE
		}

		private val textPaint = Paint(Paint.ANTI_ALIAS_FLAG).also { p ->
		p.typeface = Typeface.create("sans-serif-condensed", Typeface.BOLD)
		p.textAlign = Paint.Align.CENTER
		}

		init {
		val density = context.resources.displayMetrics.density
		intrinsicHeight = (Companion.HEIGHT * density).toInt()
		@@ -250,6 +262,25 @@ open class ThemedBatteryDrawable(private val context: Context, frameColor: Int)
		c.drawPath(scaledPlus, errorPaint)
		}
		c.restore()

		if (!charging && batteryLevel < 100 && showPercent) {
		textPaint.textSize = bounds.height() * 0.38f
		val textHeight = -textPaint.fontMetrics.ascent
		val pctX = bounds.width() * 0.5f
		val pctY = (bounds.height() + textHeight) * 0.5f

		textPaint.color = fillColor
		c.drawText(batteryLevel.toString(), pctX, pctY, textPaint)

		textPaint.color = fillColor.toInt().inv() or 0xFF000000.toInt()
		c.save()
		c.clipRect(fillRect.left,
		fillRect.top + (fillRect.height() * (1 - fillFraction)),
		fillRect.right,
		fillRect.bottom)
		c.drawText(batteryLevel.toString(), pctX, pctY, textPaint)
		c.restore()
		}
		}

		private fun batteryColorForLevel(level: Int): Int {

packages/SystemUI/res/layout/battery_percentage_view.xml

+0 −1

Original line number	Diff line number	Diff line
		@@ -25,6 +25,5 @@
		android:textAppearance="@style/TextAppearance.StatusBar.Clock"
		android:textColor="?android:attr/textColorPrimary"
		android:gravity="center_vertical\|start"
		android:paddingStart="@dimen/battery_level_padding_start"
		android:importantForAccessibility="no"
		/>

packages/SystemUI/res/values/lineage_dimens.xml

0 → 100644

+21 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		Copyright (C) 2016 The CyanogenMod Project
		Copyright (C) 2018-2019 The LineageOS Project

		Licensed under the Apache License, Version 2.0 (the "License");
		you may not use this file except in compliance with the License.
		You may obtain a copy of the License at

		http://www.apache.org/licenses/LICENSE-2.0

		Unless required by applicable law or agreed to in writing, software
		distributed under the License is distributed on an "AS IS" BASIS,
		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		See the License for the specific language governing permissions and
		limitations under the License.
		-->
		<resources>
		<!-- Width of the battery icon in the status bar when set to circle style. -->
		<dimen name="status_bar_battery_icon_circle_width">14.5dp</dimen>
		</resources>

packages/SystemUI/res/xml/status_bar_prefs.xml

+3 −4

Original line number	Diff line number	Diff line
		@@ -81,10 +81,9 @@

		<!-- other weird signal stuff -->

		<com.android.systemui.tuner.BatteryPreference
		android:title="@string/battery"
		android:summary="%s"
		android:entries="@array/battery_options" />
		<com.android.systemui.tuner.StatusBarSwitch
		android:key="battery"
		android:title="@string/battery" />

		<com.android.systemui.tuner.StatusBarSwitch
		android:key="alarm_clock"