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

Merge "Fix broken inset anims" into rvc-dev am: e858e30c46 am: e9deb750d1

Browse Source 
Change-Id: I2993952fc4c49c3a5b785ed51beea10c33a4a744
This commit is contained in:
Automerger Merge Worker
2020-03-03 01:48:44 +00:00
parent a470c74a64 e9deb750d1
commit 452205336a
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/view/InsetsAnimationControlImpl.java
View File

@@ -281,7 +281,7 @@ public class InsetsAnimationControlImpl implements WindowInsetsAnimationControll
// If the system is controlling the insets source, the leash can be null.
if (leash != null) {
// TODO: use a better interpolation for fade.
alpha = mFade ? ((float) maxInset / inset * 0.3f + 0.7f) : alpha;
alpha = mFade ? ((float) inset / maxInset * 0.3f + 0.7f) : alpha;
surfaceParams.add(new SurfaceParams(leash, side == ISIDE_FLOATING ? 1 : alpha,
mTmpMatrix, null /* windowCrop */, 0 /* layer */, 0f /* cornerRadius*/,
side == ISIDE_FLOATING ? state.getSource(source.getType()).isVisible()