From e2c0f3ff6c25bb6f888a7617cda57dc3b23fe010 Mon Sep 17 00:00:00 2001 From: Xiaowen Lei Date: Fri, 27 Dec 2024 01:04:50 +0000 Subject: Update faded color opacity in NotificationProgressBarTest. Latest update in production code was ag/30895206. Missed updating it correspondingly in tests. Looks like the tests in this directory aren't included in Presubmit. Flag: android.app.api_rich_ongoing Bug: 383557351 Test: NotificationProgressBarTest Change-Id: Iefccd622e5ecf6ac5a468d757cce636d0c5844c6 --- .../internal/widget/NotificationProgressBarTest.java | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/core/tests/coretests/src/com/android/internal/widget/NotificationProgressBarTest.java b/core/tests/coretests/src/com/android/internal/widget/NotificationProgressBarTest.java index 5613caf4427e..d26bb35e5481 100644 --- a/core/tests/coretests/src/com/android/internal/widget/NotificationProgressBarTest.java +++ b/core/tests/coretests/src/com/android/internal/widget/NotificationProgressBarTest.java @@ -120,7 +120,9 @@ public class NotificationProgressBarTest { List parts = NotificationProgressBar.processAndConvertToDrawableParts( segments, points, progress, progressMax, isStyledByProgress); - int fadedRed = 0x7FFF0000; + // Colors with 40% opacity + int fadedRed = 0x66FF0000; + List expected = new ArrayList<>(List.of(new Segment(1f, fadedRed, true))); assertThat(parts).isEqualTo(expected); @@ -199,8 +201,8 @@ public class NotificationProgressBarTest { List parts = NotificationProgressBar.processAndConvertToDrawableParts( segments, points, progress, progressMax, isStyledByProgress); - // Colors with 50% opacity - int fadedGreen = 0x7F00FF00; + // Colors with 40% opacity + int fadedGreen = 0x6600FF00; List expected = new ArrayList<>(List.of( new Segment(0.50f, Color.RED), @@ -223,9 +225,9 @@ public class NotificationProgressBarTest { int progressMax = 100; boolean isStyledByProgress = true; - // Colors with 50% opacity - int fadedBlue = 0x7F0000FF; - int fadedYellow = 0x7FFFFF00; + // Colors with 40% opacity + int fadedBlue = 0x660000FF; + int fadedYellow = 0x66FFFF00; List expected = new ArrayList<>(List.of( new Segment(0.15f, Color.BLUE), @@ -261,9 +263,9 @@ public class NotificationProgressBarTest { List parts = NotificationProgressBar.processAndConvertToDrawableParts( segments, points, progress, progressMax, isStyledByProgress); - // Colors with 50% opacity - int fadedGreen = 0x7F00FF00; - int fadedYellow = 0x7FFFFF00; + // Colors with 40% opacity + int fadedGreen = 0x6600FF00; + int fadedYellow = 0x66FFFF00; List expected = new ArrayList<>(List.of( new Segment(0.15f, Color.RED), -- cgit v1.2.3-59-g8ed1b