Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use small corner radius for roundness updates from shelf" into sc-dev

Browse Source
This commit is contained in:
Lyn Han
2021-06-04 23:35:41 +00:00
committed by Android (Google) Code Review
parent 57b72445ad 26d13fecf2
commit 4d351c5089
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java
View File

@@ -372,6 +372,9 @@ public class NotificationShelf extends ActivatableNotificationView implements
return; 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 viewEnd = viewStart + anv.getActualHeight();
final float cornerAnimationDistance = mCornerAnimationDistance final float cornerAnimationDistance = mCornerAnimationDistance
* mAmbientState.getExpansionFraction(); * mAmbientState.getExpansionFraction();
@@ -387,7 +390,7 @@ public class NotificationShelf extends ActivatableNotificationView implements
} else if (viewEnd < cornerAnimationTop) { } else if (viewEnd < cornerAnimationTop) {
// Fast scroll skips frames and leaves corners with unfinished rounding. // Fast scroll skips frames and leaves corners with unfinished rounding.
// Reset top and bottom corners outside of animation bounds. // Reset top and bottom corners outside of animation bounds.
anv.setBottomRoundness(anv.isLastInSection() ? 1f : 0f, anv.setBottomRoundness(anv.isLastInSection() ? 1f : smallCornerRadius,
false /* animate */); false /* animate */);
} }
@@ -401,7 +404,7 @@ public class NotificationShelf extends ActivatableNotificationView implements
} else if (viewStart < cornerAnimationTop) { } else if (viewStart < cornerAnimationTop) {
// Fast scroll skips frames and leaves corners with unfinished rounding. // Fast scroll skips frames and leaves corners with unfinished rounding.
// Reset top and bottom corners outside of animation bounds. // Reset top and bottom corners outside of animation bounds.
anv.setTopRoundness(anv.isFirstInSection() ? 1f : 0f, anv.setTopRoundness(anv.isFirstInSection() ? 1f : smallCornerRadius,
false /* animate */); false /* animate */);
} }
} }