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

Merge "Skip IME animation cancellation during rotation" into rvc-dev am: 992c347b10

Browse Source 
Change-Id: I7b9638c81fc8d58d66b134b8e644f6aa9e761878
This commit is contained in:
Taran Singh
2020-04-02 22:58:15 +00:00
committed by Automerger Merge Worker
parent b6347e297b 992c347b10
commit e4d484265b
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/wm/WindowStateAnimator.java
View File

@@ -1381,7 +1381,8 @@ class WindowStateAnimator {
return true;
}
if (isEntrance && mWin.mAttrs.type == TYPE_INPUT_METHOD) {
final boolean isImeWindow = mWin.mAttrs.type == TYPE_INPUT_METHOD;
if (isEntrance && isImeWindow) {
mWin.getDisplayContent().adjustForImeIfNeeded();
mWin.setDisplayLayoutNeeded();
mService.mWindowPlacerLocked.requestTraversal();
@@ -1435,11 +1436,11 @@ class WindowStateAnimator {
Trace.traceEnd(Trace.TRACE_TAG_WINDOW_MANAGER);
mAnimationIsEntrance = isEntrance;
}
} else {
} else if (!isImeWindow) {
mWin.cancelAnimation();
}
if (!isEntrance && mWin.mAttrs.type == TYPE_INPUT_METHOD) {
if (!isEntrance && isImeWindow) {
mWin.getDisplayContent().adjustForImeIfNeeded();
}