diff options
| author | Shan Huang <shanh@google.com> | 2022-05-06 19:35:42 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2022-05-06 19:35:42 +0000 |
| commit | e3a61826eb099f8e28c28d30508c632c0af07a26 (patch) | |
| tree | 7855794e3e44e4c2a36e443389ffda8bd7d8f00d /core/java/android/inputmethodservice/InputMethodService.java | |
| parent | c6b20b66d54337744c3b47113d4946120c2723d2 (diff) | |
| parent | a6666f2221af6972f3177296157d6b5a8b2fb4ad (diff) | |
Merge "Migrate IME to handle back with OnBackInvokedDispatcher." into tm-dev
Diffstat (limited to 'core/java/android/inputmethodservice/InputMethodService.java')
| -rw-r--r-- | core/java/android/inputmethodservice/InputMethodService.java | 70 |
1 files changed, 69 insertions, 1 deletions
diff --git a/core/java/android/inputmethodservice/InputMethodService.java b/core/java/android/inputmethodservice/InputMethodService.java index efd4f0681838..25296bc0a8b9 100644 --- a/core/java/android/inputmethodservice/InputMethodService.java +++ b/core/java/android/inputmethodservice/InputMethodService.java @@ -101,6 +101,7 @@ import android.view.BatchedInputEventReceiver.SimpleBatchedInputEventReceiver; import android.view.Choreographer; import android.view.Gravity; import android.view.InputChannel; +import android.view.InputDevice; import android.view.InputEventReceiver; import android.view.KeyCharacterMap; import android.view.KeyEvent; @@ -134,6 +135,9 @@ import android.widget.FrameLayout; import android.widget.ImageButton; import android.widget.LinearLayout; import android.widget.TextView; +import android.window.ImeOnBackInvokedDispatcher; +import android.window.OnBackInvokedCallback; +import android.window.OnBackInvokedDispatcher; import android.window.WindowMetricsHelper; import com.android.internal.annotations.GuardedBy; @@ -344,6 +348,9 @@ public class InputMethodService extends AbstractInputMethodService { * A circular buffer of size MAX_EVENTS_BUFFER in case IME is taking too long to add ink view. **/ private RingBuffer<MotionEvent> mPendingEvents; + private ImeOnBackInvokedDispatcher mImeDispatcher; + private Boolean mBackCallbackRegistered = false; + private final OnBackInvokedCallback mCompatBackCallback = this::compatHandleBack; /** * Returns whether {@link InputMethodService} is responsible for rendering the back button and @@ -797,7 +804,13 @@ public class InputMethodService extends AbstractInputMethodService { @Override public final void dispatchStartInputWithToken(@Nullable InputConnection inputConnection, @NonNull EditorInfo editorInfo, boolean restarting, - @NonNull IBinder startInputToken, @InputMethodNavButtonFlags int navButtonFlags) { + @NonNull IBinder startInputToken, @InputMethodNavButtonFlags int navButtonFlags, + @NonNull ImeOnBackInvokedDispatcher imeDispatcher) { + mImeDispatcher = imeDispatcher; + if (mWindow != null) { + mWindow.getOnBackInvokedDispatcher().setImeOnBackInvokedDispatcher( + imeDispatcher); + } mPrivOps.reportStartInputAsync(startInputToken); mNavigationBarController.onNavButtonFlagsChanged(navButtonFlags); if (restarting) { @@ -1496,6 +1509,10 @@ public class InputMethodService extends AbstractInputMethodService { Context.LAYOUT_INFLATER_SERVICE); Trace.traceBegin(TRACE_TAG_WINDOW_MANAGER, "IMS.initSoftInputWindow"); mWindow = new SoftInputWindow(this, mTheme, mDispatcherState); + if (mImeDispatcher != null) { + mWindow.getOnBackInvokedDispatcher() + .setImeOnBackInvokedDispatcher(mImeDispatcher); + } mNavigationBarController.onSoftInputWindowCreated(mWindow); { final Window window = mWindow.getWindow(); @@ -1608,6 +1625,8 @@ public class InputMethodService extends AbstractInputMethodService { // when IME developers are doing something unsupported. InputMethodPrivilegedOperationsRegistry.remove(mToken); } + unregisterCompatOnBackInvokedCallback(); + mImeDispatcher = null; } /** @@ -2568,8 +2587,46 @@ public class InputMethodService extends AbstractInputMethodService { cancelImeSurfaceRemoval(); mInShowWindow = false; Trace.traceEnd(TRACE_TAG_WINDOW_MANAGER); + registerCompatOnBackInvokedCallback(); + } + + + /** + * Registers an {@link OnBackInvokedCallback} to handle back invocation when ahead-of-time + * back dispatching is enabled. We keep the {@link KeyEvent#KEYCODE_BACK} based legacy code + * around to handle back on older devices. + */ + private void registerCompatOnBackInvokedCallback() { + if (mBackCallbackRegistered) { + return; + } + if (mWindow != null) { + mWindow.getOnBackInvokedDispatcher().registerOnBackInvokedCallback( + OnBackInvokedDispatcher.PRIORITY_DEFAULT, mCompatBackCallback); + mBackCallbackRegistered = true; + } + } + + private void unregisterCompatOnBackInvokedCallback() { + if (!mBackCallbackRegistered) { + return; + } + if (mWindow != null) { + mWindow.getOnBackInvokedDispatcher() + .unregisterOnBackInvokedCallback(mCompatBackCallback); + mBackCallbackRegistered = false; + } } + private KeyEvent createBackKeyEvent(int action, boolean isTracking) { + final long when = SystemClock.uptimeMillis(); + return new KeyEvent(when, when, action, + KeyEvent.KEYCODE_BACK, 0 /* repeat */, 0 /* metaState */, + KeyCharacterMap.VIRTUAL_KEYBOARD, 0 /* scancode */, + KeyEvent.FLAG_FROM_SYSTEM | KeyEvent.FLAG_VIRTUAL_HARD_KEY + | (isTracking ? KeyEvent.FLAG_TRACKING : 0), + InputDevice.SOURCE_KEYBOARD); + } private boolean prepareWindow(boolean showInput) { boolean doShowInput = false; @@ -2658,6 +2715,7 @@ public class InputMethodService extends AbstractInputMethodService { } mLastWasInFullscreenMode = mIsFullscreen; updateFullscreenMode(); + unregisterCompatOnBackInvokedCallback(); } /** @@ -3797,4 +3855,14 @@ public class InputMethodService extends AbstractInputMethodService { proto.end(token); } }; + + private void compatHandleBack() { + final KeyEvent downEvent = createBackKeyEvent( + KeyEvent.ACTION_DOWN, false /* isTracking */); + onKeyDown(KeyEvent.KEYCODE_BACK, downEvent); + final boolean hasStartedTracking = + (downEvent.getFlags() & KeyEvent.FLAG_START_TRACKING) != 0; + final KeyEvent upEvent = createBackKeyEvent(KeyEvent.ACTION_UP, hasStartedTracking); + onKeyUp(KeyEvent.KEYCODE_BACK, upEvent); + } } |
