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 am: 25aff0ecd9 am: c6a0939276 am: e99dc4ea46

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18800901

Change-Id: I310c663cea9f13edc26f6f91e6a361a788e36822
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Lucas Dupin
2022-06-10 00:08:18 +00:00
committed by Automerger Merge Worker
parent a4e2508d0e e99dc4ea46
commit 46189ee6f9
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 c = "C${hct.chroma.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"
}

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);
}
@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().
*/