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

Merge "Fix next call WIC#show(ime()) failed when the app in multi-window mode" into udc-dev

Browse Source
This commit is contained in:
Treehugger Robot
2023-06-04 17:38:24 +00:00
committed by Android (Google) Code Review
parent 1cb2fb8962 f23d750dbb
commit 4456f22c17
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/java/android/view/InsetsController.java
View File

@@ -1099,21 +1099,25 @@ public class InsetsController implements WindowInsetsController, InsetsAnimation
// TODO: Support a ResultReceiver for IME. // TODO: Support a ResultReceiver for IME.
// TODO(b/123718661): Make show() work for multi-session IME. // TODO(b/123718661): Make show() work for multi-session IME.
int typesReady = 0; int typesReady = 0;
final boolean imeVisible = mState.isSourceOrDefaultVisible(
mImeSourceConsumer.getId(), ime());
for (int type = FIRST; type <= LAST; type = type << 1) { for (int type = FIRST; type <= LAST; type = type << 1) {
if ((types & type) == 0) { if ((types & type) == 0) {
continue; continue;
} }
@AnimationType final int animationType = getAnimationType(type); @AnimationType final int animationType = getAnimationType(type);
final boolean requestedVisible = (type & mRequestedVisibleTypes) != 0; final boolean requestedVisible = (type & mRequestedVisibleTypes) != 0;
final boolean isImeAnimation = type == ime(); final boolean isIme = type == ime();
if (requestedVisible && animationType == ANIMATION_TYPE_NONE var alreadyVisible = requestedVisible && (!isIme || imeVisible)
|| animationType == ANIMATION_TYPE_SHOW) { && animationType == ANIMATION_TYPE_NONE;
var alreadyAnimatingShow = animationType == ANIMATION_TYPE_SHOW;
if (alreadyVisible || alreadyAnimatingShow) {
// no-op: already shown or animating in (because window visibility is // no-op: already shown or animating in (because window visibility is
// applied before starting animation). // applied before starting animation).
if (DEBUG) Log.d(TAG, String.format( if (DEBUG) Log.d(TAG, String.format(
"show ignored for type: %d animType: %d requestedVisible: %s", "show ignored for type: %d animType: %d requestedVisible: %s",
type, animationType, requestedVisible)); type, animationType, requestedVisible));
if (isImeAnimation) { if (isIme) {
ImeTracker.forLogging().onCancelled(statsToken, ImeTracker.forLogging().onCancelled(statsToken,
ImeTracker.PHASE_CLIENT_APPLY_ANIMATION); ImeTracker.PHASE_CLIENT_APPLY_ANIMATION);
} }
@@ -1121,13 +1125,13 @@ public class InsetsController implements WindowInsetsController, InsetsAnimation
} }
if (fromIme && animationType == ANIMATION_TYPE_USER) { if (fromIme && animationType == ANIMATION_TYPE_USER) {
// App is already controlling the IME, don't cancel it. // App is already controlling the IME, don't cancel it.
if (isImeAnimation) { if (isIme) {
ImeTracker.forLogging().onFailed( ImeTracker.forLogging().onFailed(
statsToken, ImeTracker.PHASE_CLIENT_APPLY_ANIMATION); statsToken, ImeTracker.PHASE_CLIENT_APPLY_ANIMATION);
} }
continue; continue;
} }
if (isImeAnimation) { if (isIme) {
ImeTracker.forLogging().onProgress( ImeTracker.forLogging().onProgress(
statsToken, ImeTracker.PHASE_CLIENT_APPLY_ANIMATION); statsToken, ImeTracker.PHASE_CLIENT_APPLY_ANIMATION);
} }