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

Merge "Fix notifications z-height when they don't have shadows." into sc-dev

Browse Source
This commit is contained in:
Jordan Demeulenaere
2021-03-04 12:44:29 +00:00
committed by Android (Google) Code Review
parent 1ab4403390 8c61850c78
commit 824fa2d2f1
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java
View File

@@ -2052,8 +2052,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
mNotificationLaunchHeight,
zProgress);
setTranslationZ(translationZ);
float extraWidthForClipping = params.getWidth() - getWidth()
+ MathUtils.lerp(0, mOutlineRadius * 2, params.getProgress());
float extraWidthForClipping = params.getWidth() - getWidth();
setExtraWidthForClipping(extraWidthForClipping);
int top = params.getTop();
float interpolation = Interpolators.FAST_OUT_SLOW_IN.getInterpolation(params.getProgress());

2
packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/AmbientState.java
View File

@@ -133,7 +133,7 @@ public class AmbientState {
*/
public static int getNotificationLaunchHeight(Context context) {
int zDistance = getZDistanceBetweenElements(context);
return getBaseHeight(zDistance) * 2;
return NOTIFICATIONS_HAVE_SHADOWS ? 2 * getBaseHeight(zDistance) : 4 * zDistance;
}
/**