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

Merge "Fixes a crash ColorScheme#toString" into tm-dev

Browse Source
This commit is contained in:
Lucas Dupin
2022-06-09 22:54:30 +00:00
committed by Android (Google) Code Review
parent 4332951cdb 5ecdfa1555
commit 25aff0ecd9
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/monet/src/com/android/systemui/monet/ColorScheme.kt
View File

@@ -435,7 +435,7 @@ class ColorScheme(
val h = "H${hct.hue.roundToInt().toString().padEnd(width)}" val h = "H${hct.hue.roundToInt().toString().padEnd(width)}"
val c = "C${hct.chroma.roundToInt().toString().padEnd(width)}" val c = "C${hct.chroma.roundToInt().toString().padEnd(width)}"
val t = "T${CamUtils.lstarFromInt(color).roundToInt().toString().padEnd(width)}" val t = "T${CamUtils.lstarFromInt(color).roundToInt().toString().padEnd(width)}"
val hex = Integer.toHexString(color).replaceRange(0, 2, "").uppercase() val hex = Integer.toHexString(color and 0xffffff).padStart(6, '0').uppercase()
return "$h$c$t = #$hex" return "$h$c$t = #$hex"
} }

14
packages/SystemUI/tests/src/com/android/systemui/monet/ColorSchemeTest.java
View File

@@ -146,6 +146,20 @@ public class ColorSchemeTest extends SysuiTestCase {
Assert.assertTrue(cam.getChroma() <= 8.0); Assert.assertTrue(cam.getChroma() <= 8.0);
} }
@Test
@SuppressWarnings("ResultOfMethodCallIgnored")
public void testToString() {
new ColorScheme(Color.TRANSPARENT, false /* darkTheme */).toString();
new ColorScheme(Color.argb(0, 0, 0, 0xf), false /* darkTheme */).toString();
new ColorScheme(Color.argb(0xff, 0xff, 0, 0), false /* darkTheme */).toString();
new ColorScheme(0xFFFFFFFF, false /* darkTheme */).toString();
new ColorScheme(Color.TRANSPARENT, true /* darkTheme */).toString();
new ColorScheme(Color.argb(0, 0, 0, 0xf), true /* darkTheme */).toString();
new ColorScheme(0xFFFF0000, true /* darkTheme */).toString();
new ColorScheme(0xFFFFFFFF, true /* darkTheme */).toString();
}
/** /**
* Generate xml for SystemPaletteTest#testThemeStyles(). * Generate xml for SystemPaletteTest#testThemeStyles().
*/ */