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

Commit 6c392f00 authored by Lyn Han's avatar Lyn Han Committed by Automerger Merge Worker
Browse files

Merge "Use small corner radius for roundness updates from shelf" into sc-dev am: 4d351c50 

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

Change-Id: Ia393491a3dcb843f75efb2567764dd249e6d9436
parents d6f2bd29 4d351c50

packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java

+5 −2
Original line number Diff line number Diff line
@@ -372,6 +372,9 @@ public class NotificationShelf extends ActivatableNotificationView implements 
            return;

        }



        final float smallCornerRadius =

                getResources().getDimension(R.dimen.notification_corner_radius_small)

                /  getResources().getDimension(R.dimen.notification_corner_radius);

        final float viewEnd = viewStart + anv.getActualHeight();

        final float cornerAnimationDistance = mCornerAnimationDistance

                * mAmbientState.getExpansionFraction();
@@ -387,7 +390,7 @@ public class NotificationShelf extends ActivatableNotificationView implements 
        } else if (viewEnd < cornerAnimationTop) {

            // Fast scroll skips frames and leaves corners with unfinished rounding.

            // Reset top and bottom corners outside of animation bounds.

            anv.setBottomRoundness(anv.isLastInSection() ? 1f : 0f,

            anv.setBottomRoundness(anv.isLastInSection() ? 1f : smallCornerRadius,

                    false /* animate */);

        }
@@ -401,7 +404,7 @@ public class NotificationShelf extends ActivatableNotificationView implements 
        } else if (viewStart < cornerAnimationTop) {

            // Fast scroll skips frames and leaves corners with unfinished rounding.

            // Reset top and bottom corners outside of animation bounds.

            anv.setTopRoundness(anv.isFirstInSection() ? 1f : 0f,

            anv.setTopRoundness(anv.isFirstInSection() ? 1f : smallCornerRadius,

                    false /* animate */);

        }

    }