summaryrefslogtreecommitdiff
path: root/core/java/android/view/InsetsAnimationControlImpl.java
diff options
context:
space:
mode:
authorJorim Jaggi <jjaggi@google.com>2020-03-05 15:52:21 +0100
committerJorim Jaggi <jjaggi@google.com>2020-03-05 15:52:21 +0100
commit1df5bd26729061cb0dd3ccecf929b455cfa85130 (patch)
tree218ed634b1c03de5e75a9362e7a0cc0d67a94664 /core/java/android/view/InsetsAnimationControlImpl.java
parent315b8782c496ce907fab97d051c3efdf8486484d (diff)
Fix alpha when applying insets
Test: WindowInsetsActivity Bug: 150852597 Change-Id: I352a7e6c81b5bface1fc92f8d30a36408cabb125
Diffstat (limited to 'core/java/android/view/InsetsAnimationControlImpl.java')
-rw-r--r--core/java/android/view/InsetsAnimationControlImpl.java11
1 files changed, 5 insertions, 6 deletions
diff --git a/core/java/android/view/InsetsAnimationControlImpl.java b/core/java/android/view/InsetsAnimationControlImpl.java
index 42a6175c0b27..ae509f3a82c4 100644
--- a/core/java/android/view/InsetsAnimationControlImpl.java
+++ b/core/java/android/view/InsetsAnimationControlImpl.java
@@ -166,18 +166,17 @@ public class InsetsAnimationControlImpl implements WindowInsetsAnimationControll
return false;
}
final Insets offset = Insets.subtract(mShownInsets, mPendingInsets);
- final Float alphaOffset = 1 - mPendingAlpha;
ArrayList<SurfaceParams> params = new ArrayList<>();
updateLeashesForSide(ISIDE_LEFT, offset.left, mShownInsets.left, mPendingInsets.left,
- params, state, alphaOffset);
+ params, state, mPendingAlpha);
updateLeashesForSide(ISIDE_TOP, offset.top, mShownInsets.top, mPendingInsets.top, params,
- state, alphaOffset);
+ state, mPendingAlpha);
updateLeashesForSide(ISIDE_RIGHT, offset.right, mShownInsets.right, mPendingInsets.right,
- params, state, alphaOffset);
+ params, state, mPendingAlpha);
updateLeashesForSide(ISIDE_BOTTOM, offset.bottom, mShownInsets.bottom,
- mPendingInsets.bottom, params, state, alphaOffset);
+ mPendingInsets.bottom, params, state, mPendingAlpha);
updateLeashesForSide(ISIDE_FLOATING, 0 /* offset */, 0 /* inset */, 0 /* maxInset */,
- params, state, alphaOffset);
+ params, state, mPendingAlpha);
mController.applySurfaceParams(params.toArray(new SurfaceParams[params.size()]));
mCurrentInsets = mPendingInsets;