Jeff Sharkey 0ab7007631 resolve merge conflicts of 358f0d4fc8 to master ...

Bug: 174932174
Test: I solemnly swear I tested this conflict resolution.
Exempt-From-Owner-Approval: refactoring with team leads buy-in
Change-Id: I9262a08ffc1ccede8e519d0eed90ed2bfcf0232c

2020-12-08 11:01:05 -07:00

..

AbstractInputMethodService.java

Add InputConnection app and service dump

2020-12-02 14:08:04 +00:00

CompactExtractEditLayout.java

…

ExtractButton.java

…

ExtractEditLayout.java

…

ExtractEditText.java

…

IInputMethodSessionWrapper.java

Revert "Revert "Let IME#onFinishInput called without dup onStart..."

2020-12-04 11:40:20 +08:00

IInputMethodWrapper.java

Optimized workflow for IME tracing on InputMethodService side

2020-11-13 12:29:25 +00:00

InlineSuggestionSession.java

…

InlineSuggestionSessionController.java

…

InputMethodService.java

DO NOT MERGE - Merge RQ1A.201205.011

2020-12-07 00:39:42 -08:00

Keyboard.java

…

KeyboardView.java

…

MultiClientInputMethodClientCallbackAdaptor.java

Revert "Revert "Let IME#onFinishInput called without dup onStart..."

2020-12-04 11:40:20 +08:00

MultiClientInputMethodServiceDelegate.java

…

MultiClientInputMethodServiceDelegateImpl.java

…

OWNERS

Improve OWNERS coverage across frameworks/base/.

2020-12-08 08:36:28 -07:00

package.html

…

SoftInputWindow.java

…

TEST_MAPPING

…