Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9789684b authored by Lyn Han's avatar Lyn Han Committed by Android (Google) Code Review
Browse files

Merge "Fix corner roundness for pinned notifications" into main

parents 6c1bd4b3 90c2f356
Loading
Loading
Loading
Loading
+0 −10
Original line number Diff line number Diff line
@@ -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