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

Merge "Merge "Fix floating IME visibility" into rvc-dev am: 292da01e06 am: 84a75c62f1" into rvc-d1-dev-plus-aosp

Browse Source
This commit is contained in:
Automerger Merge Worker
2020-03-24 04:10:30 +00:00
committed by Android (Google) Code Review
parent 36bf73a038 1feebcf9fe
commit 674b8384b5
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);