summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Lyn <lynhan@google.com> 2023-12-01 22:52:14 +0000
committer Lyn <lynhan@google.com> 2023-12-04 22:02:11 +0000
commit90c2f356e0cdb17b8a7ae3391015a48aabff4429 (patch)
tree4da1548f520a9e7c9ad5de4eda9302dd2fb524f9
parente4387bfe1e58286e8f535836152352a74403f271 (diff)
Fix corner roundness for pinned notifications
Sometimes the PINNED SourceType is not reset on transition from floating HUN to shade. This causes heads up notifications to have incorrectly rounded bottom corners despite having notifications appear below them in the same section. The PINNED SourceType is redundant because the HEADSUP SourceType handles rounding for the same notifications. For each HUN, ExpandableNotificationRow request roundness for HEADSUP HeadsUpAppearanceController requests roundness for PINNED We can fix this bug by removing the redundant PINNED SourceType. Fixes: 301261545 Test: send a lot of delayed HUNs, open shade => corners consistently correct swipe down on lockscreen/pulsing HUNs to open shade send delayed HUN while in fullscreen qs, close qs send HUN while scrolled, then unscroll horizontal swipe to dismiss single notifs clear all notifs => no corner regressions Change-Id: Iadc76c251a77582f1c99652172fda882ce7d8abf
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java10
1 files changed, 0 insertions, 10 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java
index 6cb079a22e7d..b6d4dedfe6f7 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java
@@ -139,7 +139,6 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
private static final long RECENTLY_ALERTED_THRESHOLD_MS = TimeUnit.SECONDS.toMillis(30);
private static final SourceType BASE_VALUE = SourceType.from("BaseValue");
private static final SourceType FROM_PARENT = SourceType.from("FromParent(ENR)");
- private static final SourceType PINNED = SourceType.from("Pinned");
// We don't correctly track dark mode until the content views are inflated, so always update
// the background on first content update just in case it happens to be during a theme change.
@@ -147,7 +146,6 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
private boolean mIsSnoozed;
private boolean mShowSnooze = false;
private boolean mIsFaded;
- private boolean mAnimatePinnedRoundness = false;
/**
* Listener for when {@link ExpandableNotificationRow} is laid out.
@@ -1053,14 +1051,6 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
if (isAboveShelf() != wasAboveShelf) {
mAboveShelfChangedListener.onAboveShelfStateChanged(!wasAboveShelf);
}
- if (pinned) {
- // Should be animated if someone explicitly set it to 0 and the row is shown.
- boolean animated = mAnimatePinnedRoundness && isShown();
- requestRoundness(/* top = */ 1f, /* bottom = */ 1f, PINNED, animated);
- } else {
- requestRoundnessReset(PINNED);
- mAnimatePinnedRoundness = true;
- }
}
@Override