Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f4af10f0 authored by Johannes Gallmann's avatar Johannes Gallmann
Browse files

Fix IME back callback not being invoked for hardware back key 

When an application has predictive back animations disabled
(enableOnBackInvokedCallback=false), but the active IME has them
enabled, the IME's registered back callback was not being invoked for a
hardware back key event.

Instead of invoking the callback, the system would fall back to the
default behavior of hiding the IME. While this is often the desired
outcome, it prevents IMEs from implementing custom back handling logic.

This change ensures that if the top back callback belongs to the IME, it
is invoked regardless of the application's predictive back setting.

Bug: 442771291
Test: KeyboardVisibilityControlTest
Flag: EXEMPT bugfix
Change-Id: I5dffe289ca73c3fd038284f85dc5f9d6762251c6
parent c289433d

core/java/android/view/ViewRootImpl.java

+7 −1
Original line number Diff line number Diff line
@@ -273,6 +273,7 @@ import android.window.ActivityWindowInfo; 
import android.window.BackEvent;

import android.window.ClientWindowFrames;

import android.window.CompatOnBackInvokedCallback;

import android.window.ImeBackCallbackProxy;

import android.window.InputTransferToken;

import android.window.OnBackAnimationCallback;

import android.window.OnBackInvokedCallback;
@@ -7791,7 +7792,12 @@ public final class ViewRootImpl implements ViewParent, 
                            return FORWARD;

                        }

                    } else if (mContext != null

                            && mOnBackInvokedDispatcher.isOnBackInvokedCallbackEnabled()) {

                            && (mOnBackInvokedDispatcher.isOnBackInvokedCallbackEnabled()

                            || mOnBackInvokedDispatcher.getTopCallback()

                            instanceof ImeBackAnimationController

                            || mOnBackInvokedDispatcher.getTopCallback()

                            instanceof ImeBackCallbackProxy.ImeOnBackInvokedCallback)

                    ) {

                        return doOnBackKeyEvent(keyEvent);

                    }

                }