summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Taran Singh <tarandeep@google.com> 2020-03-23 15:04:58 -0700
committer Taran Singh <tarandeep@google.com> 2020-03-23 15:58:39 -0700
commit0485041305cc1c22a6939bbd40adc01d48fc1cab (patch)
tree4b6a4baf5a1903c56488b39f67b2b8217a63d483
parent174fd34cba4786fab2955503fe9bad42419af4e2 (diff)
Fix floating IME visibility
Floating IME now applies final visibility Test: Manually using steps in bug Fix: 151953095 Change-Id: Id611e4bac22e9663d04e260794ea0f621d7b7e29
-rw-r--r--core/java/android/view/InsetsAnimationControlImpl.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/core/java/android/view/InsetsAnimationControlImpl.java b/core/java/android/view/InsetsAnimationControlImpl.java
index f827eda07901..b70072877c66 100644
--- a/core/java/android/view/InsetsAnimationControlImpl.java
+++ b/core/java/android/view/InsetsAnimationControlImpl.java
@@ -196,11 +196,10 @@ public class InsetsAnimationControlImpl implements WindowInsetsAnimationControll
if (mCancelled || mFinished) {
return;
}
+ mShownOnFinish = shown;
setInsetsAndAlpha(shown ? mShownInsets : mHiddenInsets, 1f /* alpha */, 1f /* fraction */);
mFinished = true;
mListener.onFinished(this);
-
- mShownOnFinish = shown;
}
@Override
@@ -301,7 +300,7 @@ public class InsetsAnimationControlImpl implements WindowInsetsAnimationControll
.withAlpha(side == ISIDE_FLOATING ? 1 : alpha)
.withMatrix(mTmpMatrix)
.withVisibility(side == ISIDE_FLOATING
- ? state.getSource(source.getType()).isVisible()
+ ? mShownOnFinish
: inset != 0 /* visible */)
.build();
surfaceParams.add(params);