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

Merge "Revert "Show battery percentage in QS header"" into udc-dev

Browse Source
This commit is contained in:
Treehugger Robot
2023-06-16 22:02:04 +00:00
committed by Android (Google) Code Review
parent 31802ef71e b6346d2733
commit fe41ea831e
2 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
packages/SystemUI/src/com/android/systemui/shade/QsBatteryModeController.kt
View File

@@ -39,12 +39,19 @@ constructor(
* [cutout]. We don't show battery estimation in qqs header on the devices with center cutout. * [cutout]. We don't show battery estimation in qqs header on the devices with center cutout.
* The result might be null when the battery icon is invisible during the qs-qqs transition * The result might be null when the battery icon is invisible during the qs-qqs transition
* animation. * animation.
*
* Note: short-circuiting this value until a comprehensive fix for b/282044659 is finished.
*/ */
@BatteryMeterView.BatteryPercentMode @BatteryMeterView.BatteryPercentMode
fun getBatteryMode(cutout: DisplayCutout?, qsExpandedFraction: Float): Int? = fun getBatteryMode(cutout: DisplayCutout?, qsExpandedFraction: Float): Int? =
BatteryMeterView.MODE_ON when {
qsExpandedFraction > fadeInStartFraction -> BatteryMeterView.MODE_ESTIMATE
qsExpandedFraction < fadeOutCompleteFraction ->
if (hasCenterCutout(cutout)) {
BatteryMeterView.MODE_ON
} else {
BatteryMeterView.MODE_ESTIMATE
}
else -> null
}
fun updateResources() { fun updateResources() {
fadeInStartFraction = fadeInStartFraction =

14
packages/SystemUI/tests/src/com/android/systemui/shade/QsBatteryModeControllerTest.kt
View File

@@ -63,40 +63,36 @@ class QsBatteryModeControllerTest : SysuiTestCase() {
@Test @Test
fun returnsMODE_ESTIMATEforQsWithCenterCutout() { fun returnsMODE_ESTIMATEforQsWithCenterCutout() {
// TODO (b/282044659): revert this test to previous behavior
assertThat(controller.getBatteryMode(CENTER_TOP_CUTOUT, QS_END_FRAME.nextFrameToFraction())) assertThat(controller.getBatteryMode(CENTER_TOP_CUTOUT, QS_END_FRAME.nextFrameToFraction()))
.isEqualTo(BatteryMeterView.MODE_ON) .isEqualTo(BatteryMeterView.MODE_ESTIMATE)
} }
@Test @Test
fun returnsMODE_ONforQqsWithCornerCutout() { fun returnsMODE_ONforQqsWithCornerCutout() {
whenever(insetsProvider.currentRotationHasCornerCutout()).thenReturn(true) whenever(insetsProvider.currentRotationHasCornerCutout()).thenReturn(true)
// TODO (b/282044659): revert this test to previous behavior
assertThat( assertThat(
controller.getBatteryMode(CENTER_TOP_CUTOUT, QQS_START_FRAME.prevFrameToFraction()) controller.getBatteryMode(CENTER_TOP_CUTOUT, QQS_START_FRAME.prevFrameToFraction())
) )
.isEqualTo(BatteryMeterView.MODE_ON) .isEqualTo(BatteryMeterView.MODE_ESTIMATE)
} }
@Test @Test
fun returnsMODE_ESTIMATEforQsWithCornerCutout() { fun returnsMODE_ESTIMATEforQsWithCornerCutout() {
whenever(insetsProvider.currentRotationHasCornerCutout()).thenReturn(true) whenever(insetsProvider.currentRotationHasCornerCutout()).thenReturn(true)
// TODO (b/282044659): revert this test to previous behavior
assertThat(controller.getBatteryMode(CENTER_TOP_CUTOUT, QS_END_FRAME.nextFrameToFraction())) assertThat(controller.getBatteryMode(CENTER_TOP_CUTOUT, QS_END_FRAME.nextFrameToFraction()))
.isEqualTo(BatteryMeterView.MODE_ON) .isEqualTo(BatteryMeterView.MODE_ESTIMATE)
} }
@Test @Test
fun returnsNullInBetween() { fun returnsNullInBetween() {
// TODO (b/282044659): revert this test to previous behavior
assertThat( assertThat(
controller.getBatteryMode(CENTER_TOP_CUTOUT, QQS_START_FRAME.nextFrameToFraction()) controller.getBatteryMode(CENTER_TOP_CUTOUT, QQS_START_FRAME.nextFrameToFraction())
) )
.isEqualTo(BatteryMeterView.MODE_ON) .isNull()
assertThat(controller.getBatteryMode(CENTER_TOP_CUTOUT, QS_END_FRAME.prevFrameToFraction())) assertThat(controller.getBatteryMode(CENTER_TOP_CUTOUT, QS_END_FRAME.prevFrameToFraction()))
.isEqualTo(BatteryMeterView.MODE_ON) .isNull()
} }
private fun Int.prevFrameToFraction(): Float = (this - 1) / MOTION_LAYOUT_MAX_FRAME.toFloat() private fun Int.prevFrameToFraction(): Float = (this - 1) / MOTION_LAYOUT_MAX_FRAME.toFloat()