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

Merge "Remove unneeded isShadeOpening check when clipping bottom HUN" into tm-dev am: c2da1090e9

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

Change-Id: If18c66f3a913d7f56e53467745d1de0ae8377c5d
This commit is contained in:
TreeHugger Robot
2022-03-15 01:29:52 +00:00
committed by Automerger Merge Worker
parent 2cb9eab746 c2da1090e9
commit 588ce9e99f
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/StackScrollAlgorithm.java
View File

@@ -202,12 +202,10 @@ public class StackScrollAlgorithm {
float newHeight = state.height; float newHeight = state.height;
float newNotificationEnd = newYTranslation + newHeight; float newNotificationEnd = newYTranslation + newHeight;
boolean isHeadsUp = (child instanceof ExpandableNotificationRow) && child.isPinned(); boolean isHeadsUp = (child instanceof ExpandableNotificationRow) && child.isPinned();
final boolean shadeClosedWithHUN =
ambientState.isShadeOpening() && !ambientState.isShadeExpanded();
if (mClipNotificationScrollToTop if (mClipNotificationScrollToTop
&& (!state.inShelf || (isHeadsUp && !firstHeadsUp)) && (!state.inShelf || (isHeadsUp && !firstHeadsUp))
&& newYTranslation < clipStart && newYTranslation < clipStart
&& shadeClosedWithHUN) { && !ambientState.isShadeExpanded()) {
// The previous view is overlapping on top, clip! // The previous view is overlapping on top, clip!
float overlapAmount = clipStart - newYTranslation; float overlapAmount = clipStart - newYTranslation;
state.clipTopAmount = (int) overlapAmount; state.clipTopAmount = (int) overlapAmount;