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

Merge "[Bouncer] Fix overlap from notif shade" into tm-dev

Browse Source
This commit is contained in:
Aaron Liu
2022-05-04 16:30:33 +00:00
committed by Android (Google) Code Review
parent f372925a29 ad4b41ada6
commit 12931e7709
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java
View File

@@ -70,6 +70,7 @@ import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.graphics.ColorUtils; import com.android.internal.graphics.ColorUtils;
import com.android.internal.jank.InteractionJankMonitor; import com.android.internal.jank.InteractionJankMonitor;
import com.android.internal.policy.SystemBarUtils; import com.android.internal.policy.SystemBarUtils;
import com.android.keyguard.BouncerPanelExpansionCalculator;
import com.android.keyguard.KeyguardSliceView; import com.android.keyguard.KeyguardSliceView;
import com.android.settingslib.Utils; import com.android.settingslib.Utils;
import com.android.systemui.Dependency; import com.android.systemui.Dependency;
@@ -1313,7 +1314,10 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
final float endTopPosition = mTopPadding + mExtraTopInsetForFullShadeTransition final float endTopPosition = mTopPadding + mExtraTopInsetForFullShadeTransition
+ mAmbientState.getOverExpansion() + mAmbientState.getOverExpansion()
- getCurrentOverScrollAmount(false /* top */); - getCurrentOverScrollAmount(false /* top */);
final float fraction = mAmbientState.getExpansionFraction(); float fraction = mAmbientState.getExpansionFraction();
if (mAmbientState.isBouncerInTransit()) {
fraction = BouncerPanelExpansionCalculator.aboutToShowBouncerProgress(fraction);
}
final float stackY = MathUtils.lerp(0, endTopPosition, fraction); final float stackY = MathUtils.lerp(0, endTopPosition, fraction);
mAmbientState.setStackY(stackY); mAmbientState.setStackY(stackY);
if (mOnStackYChanged != null) { if (mOnStackYChanged != null) {