summaryrefslogtreecommitdiffstats
path: root/services/java/com/android/server/InputMethodManagerService.java
Commit message (Collapse)AuthorAgeFilesLines
* resolved conflicts for merge of ee0a5faf to masterKenny Root2013-05-031-6/+17
|\ | | | | | | Change-Id: Iba0ad9e665ad98379761995cb7c32415bcf50e48
| * am 245a3e1c: Merge "Change the initial disabled state of disabled IMEs" into ↵Satoshi Kataoka2013-05-031-5/+16
| |\ | | | | | | | | | | | | | | | | | | jb-mr2-dev * commit '245a3e1c1ed265a13d07000ef6e786ec321b85c4': Change the initial disabled state of disabled IMEs
| | * Change the initial disabled state of disabled IMEsSatoshi Kataoka2013-05-021-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8365223 This change is a supplement for I77f01c70610d82ce9070d4a The disabled state of disabled pre-installed imes should be changed to ENABLED_STATE_DISABLED_UNTIL_USED on boot or user switch. Change-Id: If8ff1b2b95c36d33148def2ab87bd006aa520cc0
* | | am f09993ca: am 1a546dca: Merge "Fixed the problem ime invisible status ↵Satoshi Kataoka2013-04-181-1/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | despite being the icon that appears in the statusbar." * commit 'f09993ca1d01823f9c60c0be45a8169e09dd27d7': Fixed the problem ime invisible status despite being the icon that appears in the statusbar.
| * | am 1a546dca: Merge "Fixed the problem ime invisible status despite being the ↵Satoshi Kataoka2013-04-181-1/+3
| |\ \ | | |/ | |/| | | | | | | | | | | | | icon that appears in the statusbar." * commit '1a546dca77b47b86c87ddf4de7a76662ef8bd48b': Fixed the problem ime invisible status despite being the icon that appears in the statusbar.
| | * Fixed the problem ime invisible status despite being the icon that appears ↵jungheang.lee2013-02-281-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in the statusbar. [Reproduce the Path] Precondition : Set "Auto-rotate screen" option to ENABLE Calendar App lunch -> Rotate device to "Landscape" -> Touch "+" button(Add new Schedule) -> Check the ime icons of the Status bar Ime invisible status despite being the icon that appears in the statusbar. Displays an icon in the status bar when the ime was actually visible state is modified to check. Change-Id: If103ab909c5bfa6391eb51a696fb8b8f0b18808c
* | | am 3e3a7b3b: am f024e7ac: Merge "Fix possible NPE" into jb-mr2-devSatoshi Kataoka2013-04-171-1/+1
|\ \ \ | |/ / | | | | | | | | | * commit '3e3a7b3b1ed641dfa7c321f48bd228c59dc3c180': Fix possible NPE
| * | Fix possible NPESatoshi Kataoka2013-04-171-1/+1
| | | | | | | | | | | | | | | Bug: 8517083 Change-Id: Iea6bdcb0e39ee951b7f90f41cd3350bd1c7c5f71
* | | am 4c2a7b23: am 4a706bc6: Merge "Correctly manage the lifecycle of IME ↵Jeff Brown2013-04-051-7/+18
|\ \ \ | |/ / | | | | | | | | | | | | | | | InputChannels." into jb-mr2-dev * commit '4c2a7b23f5f012cf00357035f840a32d4da20eb5': Correctly manage the lifecycle of IME InputChannels.
| * | Correctly manage the lifecycle of IME InputChannels.Jeff Brown2013-04-041-7/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | InputChannels are normally duplicated when sent to a remote process over Binder but this does not happen if the recipient is running within the system server process. This causes problems for KeyGuard because the InputMethodManagerService may accidentally dispose the channel that KeyGuard is using. Fixed the lifecycle of InputChannels that are managed by the IME framework. We now return a duplicate of the channel to the application and then take care to dispose of the duplicate when necessary. In particular, InputBindResult disposes its InputChannel automatically when returned through Binder (using PARCELABLE_WRITE_RETURN_VALUE). Bug: 8493879 Change-Id: I08ec3d13268c76f3b56706b4523508bcefa3be79
* | | am 6b8e7b35: am bf20aa76: Merge "Keep track of who has disabled ↵Dianne Hackborn2013-03-271-1/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | applications." into jb-mr2-dev * commit '6b8e7b35ef763d29a30c87a5a95ef941d39a8ee9': Keep track of who has disabled applications.
| * | Merge "Keep track of who has disabled applications." into jb-mr2-devDianne Hackborn2013-03-271-1/+2
| |\ \
| | * | Keep track of who has disabled applications.Dianne Hackborn2013-03-271-1/+2
| | | | | | | | | | | | | | | | Change-Id: I2640d3dc2200b589e2beb42a43cc93efd090f06e
* | | | am 901b77c6: am ca3d655d: Merge "Use input transport for communications ↵Jeff Brown2013-03-261-46/+81
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | between app and IME." into jb-mr2-dev * commit '901b77c63bc707c5785a149975e2113a43e38ad6': Use input transport for communications between app and IME.
| * | | Use input transport for communications between app and IME.Jeff Brown2013-03-261-46/+81
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The input method manager service now supplies an input channel for communication while creating an IME session on behalf of the application. This change significanly reduces the overhead of IME event dispatch by using a standard input channel to send input events rather than using binder. This results in fewer thread context switches and fewer object allocations. What's more, the IME may perform additional batching of the motion events that it receives which may help it catch up if it is getting behind while processing them. Bug: 7984576 Bug: 8473020 Change-Id: Ibe26311edd0060cdcae80194f1753482e635786f
* | | am 8277f248: am b685faa2: Merge "Implement #8323587, #8323342, #8323590: new ↵Dianne Hackborn2013-03-231-0/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | features." into jb-mr2-dev * commit '8277f24865e52915b4825517860629c0385f79ed': Implement #8323587, #8323342, #8323590: new features.
| * | Implement #8323587, #8323342, #8323590: new features.Dianne Hackborn2013-03-221-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8323587: Add feature for supporting app widgets 8323342: Add feature for replacing the home screen 8323590: Add feature for supporting input methods The app widget service looks for the app widget feature and refuses to work if it doesn't exist. I didn't do this for the input method service because some devices will probably want to still make use of that mechanism without supporting third party input methods. Change-Id: Ie3b089105e104f4d767cdb03cdbe4fdb1c17382e
* | | am 621c35e4: am 765ddb4b: Merge "Separate sessionCreated and finishedEvents ↵Michael Wright2013-03-221-7/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | callbacks" into jb-mr2-dev * commit '621c35e4fc83c2864a82da31aac767832ce86df6': Separate sessionCreated and finishedEvents callbacks
| * | Separate sessionCreated and finishedEvents callbacksMichael Wright2013-03-211-7/+3
| | | | | | | | | | | | | | | Bug: 8276952 Change-Id: If7051086c060fcce5d1e958ebbddec0784c851da
* | | am 20a402e0: am 8dfe99ce: Merge "Catch BadTokenException and continue." into ↵Craig Mautner2013-03-151-22/+8
|\ \ \ | |/ / | | | | | | | | | | | | | | | jb-mr2-dev * commit '20a402e0dc8d3052ac317e6c13afee22a9502c35': Catch BadTokenException and continue.
| * | Catch BadTokenException and continue.Craig Mautner2013-03-151-22/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BadTokenException is a normal consequence of swapping IMEs while there is a DO_SHOW_SOFT_INPUT message in the IIMethodWrapper queue. This race condition cannot be avoided without an unacceptable lock down of InputMethodManagerService. Fixes bug 8387663. Fixes bug 8263462. Change-Id: I2c21573cf972145ab08e66604cdb9344139a3f31
* | | am b7ca6804: am 67bea2ef: Merge "Remove WindowManager messages from remote ↵Craig Mautner2013-03-141-7/+12
|\ \ \ | |/ / | | | | | | | | | | | | | | | queue." into jb-mr2-dev * commit 'b7ca680485f90c2507d969d7d64e5bec3acc3c33': Remove WindowManager messages from remote queue.
| * | Remove WindowManager messages from remote queue.Craig Mautner2013-03-141-7/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a new IME is attached it is not enough to remove the WindowManager messages from the local queue, but the ones in the previous IME queue must also be removed. Fixes bug 8263462. Change-Id: I9e916c6052a83dc7691bcba0b6ab8328b9b7cc36
* | | am 35d45010: am dc50ba18: Merge "Put debug back in for b/b8263462." into ↵Craig Mautner2013-03-141-5/+11
|\ \ \ | |/ / | | | | | | | | | | | | | | | jb-mr2-dev * commit '35d450107716d5ea950a19ffe09065ad4cb8b1fc': Put debug back in for b/b8263462.
| * | Put debug back in for b/b8263462.Craig Mautner2013-03-131-5/+11
| | | | | | | | | | | | | | | | | | Previous CL did not fix. Change-Id: Ief9e8f519480fa41248d53e5b0187c9657f00b79
| * | Remove old show/hide messages on new ime (DO NOT MERGE)Craig Mautner2013-03-121-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | The previous show/hide messages in the queue were still trying to be honored even after a new ime was attached. Fixes bug 8263462. Change-Id: Iee60dbd1d58542f73aedeac5ccb54cddeb5d5dfe
* | | Remove old show/hide messages on new imeCraig Mautner2013-03-121-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | The previous show/hide messages in the queue were still trying to be honored even after a new ime was attached. Fixes bug 8263462. Change-Id: Ie85369346cd3f843389a8e7837f5d97b56885309
* | | Add debug for b/8263462.Craig Mautner2013-03-111-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Look for race condition in soft input method attach. For bug 8263462. Change-Id: Id0609a743d57ab685c036372100ddd33819bff03
* | | Add a comment for secondary user handling in IMMSSatoshi Kataoka2013-02-251-1/+6
|/ / | | | | | | | | | | | | | | This is a follow up change for I438daf996ba48cdb34f0a6 Bug: 8205725 Change-Id: Iae87580b7d56ed8badf548ac1830ddb12a051148
* | Fix an issue where voice input is not enabled by default for the secondary userSatoshi Kataoka2013-02-181-5/+12
| | | | | | | | | | Bug: 8205725 Change-Id: I438daf996ba48cdb34f0a6158a0cbb510aae931b
* | Do not turn on imes unexpectedly with unit testsSatoshi Kataoka2013-01-281-15/+30
| | | | | | | | | | | | Bug: 7872918 Change-Id: Ie1d74c9fac27de140e7aa85f2eaefcb89aa06ea7
* | Add new disabled state for "optional" built-in apps.Dianne Hackborn2013-01-221-7/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The disabled state allows you to make an app disabled except for whatever parts of the system still want to provide access to them and automatically enable them if the user want to use it. Currently the input method manager service is the only part of the system that supports this, so you can put an IME in this state and it will generally look disabled but still be available in the IME list and once selected switched to the enabled state. Change-Id: I77f01c70610d82ce9070d4aabbadec8ae2cff2a3
* | Merge "Ensure that the input method dialog is dismissed when changing the ↵Satoshi Kataoka2013-01-181-0/+3
|\ \ | | | | | | | | | hardware keyboard state."
| * | Ensure that the input method dialog is dismissed when changing the hardware ↵Satoshi Kataoka2013-01-181-0/+3
| | | | | | | | | | | | | | | | | | keyboard state. Change-Id: I51882ecd2b1a12116f43afff7c23454164a6272b
* | | Merge "Rename bindService to bindServiceAsUser to follow convention."Amith Yamasani2013-01-161-1/+2
|\ \ \ | |/ / |/| |
| * | Rename bindService to bindServiceAsUser to follow convention.Amith Yamasani2013-01-161-1/+2
| | | | | | | | | | | | | | | | | | This is for the multi-user version of bindService, not the original. Change-Id: Ib2de35941196accf387b1a276a77e6f9af805ec0
* | | Refactor utilities for InputMethodManagerSerivce that we want to share with ↵Satoshi Kataoka2013-01-151-775/+62
|/ / | | | | | | | | | | | | | | the Settings application Bug: 7872918 Change-Id: I0bc9954f163a3ec38d08b9ba842a8a31176eb6a6
* | am 50fc82fd: am 30b074fc: am 2495d08a: am 5327322a: Merge "Revert "Fix a bug ↵Satoshi Kataoka2013-01-111-9/+0
|\ \ | |/ | | | | | | | | | | where disabled auxilialy IME is unexpectedly re-enabled"" into jb-mr1.1-dev * commit '50fc82fdf025bc1fee8f0eb50fa88e4591c8daae': Revert "Fix a bug where disabled auxilialy IME is unexpectedly re-enabled"
| * am 2495d08a: am 5327322a: Merge "Revert "Fix a bug where disabled auxilialy ↵Satoshi Kataoka2013-01-101-9/+0
| |\ | | | | | | | | | | | | | | | | | | IME is unexpectedly re-enabled"" into jb-mr1.1-dev * commit '2495d08a5c06556deb7c3993add337037b8b492e': Revert "Fix a bug where disabled auxilialy IME is unexpectedly re-enabled"
| | * Revert "Fix a bug where disabled auxilialy IME is unexpectedly re-enabled"Satoshi Kataoka2013-01-101-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 32b812054cce27d1c70b53ba8ac729c7186b105e Bug: 7976890 Change-Id: I75ab60734153719b199cf7281d23f5eb1ad2d1bc
* | | am 5ce02267: am 7ad7b2c4: am 32b81205: Fix a bug where disabled auxilialy ↵satok2012-12-191-0/+9
|\ \ \ | |/ / | | | | | | | | | | | | | | | IME is unexpectedly re-enabled * commit '5ce0226708ec75b8636d062ae89aeb410c06659c': Fix a bug where disabled auxilialy IME is unexpectedly re-enabled
| * | am 32b81205: Fix a bug where disabled auxilialy IME is unexpectedly re-enabledsatok2012-12-191-0/+9
| |\ \ | | |/ | | | | | | | | | * commit '32b812054cce27d1c70b53ba8ac729c7186b105e': Fix a bug where disabled auxilialy IME is unexpectedly re-enabled
| | * Fix a bug where disabled auxilialy IME is unexpectedly re-enabledsatok2012-12-191-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 7872918 This is a serious issue which the disabled system auxilialy IME is unexpectedly re-enabled by re-building internal IMI cache. Change-Id: I0727cc973dfaea9823194021ce94af8665b98373
* | | resolved conflicts for merge of ebcbfb3f to masterMita Yun2012-12-101-2/+2
|\ \ \ | |/ / | | | | | | Change-Id: I0658dd4a1418fbad91d9663e5b52418a979dc683
| * | Use asynchronous messages for input method events.Mita Yun2012-12-061-2/+2
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | Improves the throughput of IME event handling by ensuring that input events do not get serialized behind UI traversal and drawing messages such as when the UI is animating. Added support for creating an asynchronous Handler as part of a HandlerCaller. It turns out we should be using an asynchronous Handler not only in IME dispatch but also in accessibility and wallpaper events where HandlerCaller is used. So fixed those services to also use an asynchronous Handler. Change-Id: I0b19140c9d5ca6ee300c1a150c48312fd55ed8eb
* | am 8ec9f8f0: am dc5b21a5: am 487f8e93: Merge "Fix an issue on installing ↵satok2012-12-051-2/+4
|\ \ | |/ | | | | | | | | | | 3rd-party IME by a non-primary user" into jb-mr1.1-dev * commit '8ec9f8f074ea35cad6e6a75a87e4bde947f12ea1': Fix an issue on installing 3rd-party IME by a non-primary user
| * Fix an issue on installing 3rd-party IME by a non-primary usersatok2012-12-041-2/+4
| | | | | | | | | | | | | | | | Bug: 7573552 Currently IMMS doesn't receive install/uninstall messages. Accordingly enabled IMEs' list is not refreshed properly. Change-Id: I25e9798a65f528dd270cd6bb1f14b1d887194787
* | am c86ae7cf: am 1c37b800: am 1af08411: Merge "Hide current soft input when a ↵Satoshi Kataoka2012-11-271-3/+11
|\ \ | |/ | | | | | | | | | | background user gains window focus." into jb-mr1.1-dev * commit 'c86ae7cf318f6c9d8cf581447e8897fbc1245ef3': Hide current soft input when a background user gains window focus.
| * Merge "Hide current soft input when a background user gains window focus." ↵Satoshi Kataoka2012-11-261-3/+11
| |\ | | | | | | | | | into jb-mr1.1-dev
| | * Hide current soft input when a background user gains window focus.Satoshi Kataoka2012-11-201-3/+11
| | | | | | | | | | | | | | | Bug: 7507226 Change-Id: If58f68469e21eaaba8536c4b54b3aa8cf8c08eb5