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

Merge "Fix unexpected hide IME cases" into sc-v2-dev am: 52c1467044

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16171117

Change-Id: Id7a97a792347f41a5eb9275436b2ca90968b2f95
This commit is contained in:
TreeHugger Robot
2021-11-03 08:15:06 +00:00
committed by Automerger Merge Worker
parent a2166f121b 52c1467044
commit 303e2eaa17
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -124,7 +124,7 @@ public final class ImeInsetsSourceConsumer extends InsetsSourceConsumer {
public void setControl(@Nullable InsetsSourceControl control, int[] showTypes, public void setControl(@Nullable InsetsSourceControl control, int[] showTypes,
int[] hideTypes) { int[] hideTypes) {
super.setControl(control, showTypes, hideTypes); super.setControl(control, showTypes, hideTypes);
if (control == null && !mIsRequestedVisibleAwaitingControl) { if (control == null && !isRequestedVisibleAwaitingControl()) {
hide(); hide();
removeSurface(); removeSurface();
} }

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

@@ -284,8 +284,8 @@ public class InsetsAnimationControlImpl implements InternalInsetsAnimationContro
mShownOnFinish, mCurrentAlpha, mCurrentInsets)); mShownOnFinish, mCurrentAlpha, mCurrentInsets));
mController.notifyFinished(this, mShownOnFinish); mController.notifyFinished(this, mShownOnFinish);
releaseLeashes(); releaseLeashes();
}
if (DEBUG) Log.d(TAG, "Animation finished abruptly."); if (DEBUG) Log.d(TAG, "Animation finished abruptly.");
}
return mFinished; return mFinished;
} }