summaryrefslogtreecommitdiffstats
path: root/services/java/com/android/server/InputMethodManagerService.java
Commit message (Expand)AuthorAgeFilesLines
* resolved conflicts for merge of ee0a5faf to masterKenny Root2013-05-031-6/+17
|\
| * am 245a3e1c: Merge "Change the initial disabled state of disabled IMEs" into ...Satoshi Kataoka2013-05-031-5/+16
| |\
| | * Change the initial disabled state of disabled IMEsSatoshi Kataoka2013-05-021-5/+16
* | | am f09993ca: am 1a546dca: Merge "Fixed the problem ime invisible status despi...Satoshi Kataoka2013-04-181-1/+3
|\ \ \ | |/ /
| * | am 1a546dca: Merge "Fixed the problem ime invisible status despite being the ...Satoshi Kataoka2013-04-181-1/+3
| |\ \ | | |/ | |/|
| | * Fixed the problem ime invisible status despite being the icon that appears in...jungheang.lee2013-02-281-1/+3
* | | am 3e3a7b3b: am f024e7ac: Merge "Fix possible NPE" into jb-mr2-devSatoshi Kataoka2013-04-171-1/+1
|\ \ \ | |/ /
| * | Fix possible NPESatoshi Kataoka2013-04-171-1/+1
* | | am 4c2a7b23: am 4a706bc6: Merge "Correctly manage the lifecycle of IME InputC...Jeff Brown2013-04-051-7/+18
|\ \ \ | |/ /
| * | Correctly manage the lifecycle of IME InputChannels.Jeff Brown2013-04-041-7/+18
* | | am 6b8e7b35: am bf20aa76: Merge "Keep track of who has disabled applications....Dianne Hackborn2013-03-271-1/+2
|\ \ \ | |/ /
| * | 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
* | | | am 901b77c6: am ca3d655d: Merge "Use input transport for communications betwe...Jeff Brown2013-03-261-46/+81
|\ \ \ \ | |/ / /
| * | | Use input transport for communications between app and IME.Jeff Brown2013-03-261-46/+81
| |/ /
* | | am 8277f248: am b685faa2: Merge "Implement #8323587, #8323342, #8323590: new ...Dianne Hackborn2013-03-231-0/+3
|\ \ \ | |/ /
| * | Implement #8323587, #8323342, #8323590: new features.Dianne Hackborn2013-03-221-0/+3
* | | am 621c35e4: am 765ddb4b: Merge "Separate sessionCreated and finishedEvents c...Michael Wright2013-03-221-7/+3
|\ \ \ | |/ /
| * | Separate sessionCreated and finishedEvents callbacksMichael Wright2013-03-211-7/+3
* | | am 20a402e0: am 8dfe99ce: Merge "Catch BadTokenException and continue." into ...Craig Mautner2013-03-151-22/+8
|\ \ \ | |/ /
| * | Catch BadTokenException and continue.Craig Mautner2013-03-151-22/+8
* | | am b7ca6804: am 67bea2ef: Merge "Remove WindowManager messages from remote qu...Craig Mautner2013-03-141-7/+12
|\ \ \ | |/ /
| * | Remove WindowManager messages from remote queue.Craig Mautner2013-03-141-7/+12
* | | am 35d45010: am dc50ba18: Merge "Put debug back in for b/b8263462." into jb-m...Craig Mautner2013-03-141-5/+11
|\ \ \ | |/ /
| * | Put debug back in for b/b8263462.Craig Mautner2013-03-131-5/+11
| * | Remove old show/hide messages on new ime (DO NOT MERGE)Craig Mautner2013-03-121-0/+4
* | | Remove old show/hide messages on new imeCraig Mautner2013-03-121-3/+7
* | | Add debug for b/8263462.Craig Mautner2013-03-111-3/+3
* | | Add a comment for secondary user handling in IMMSSatoshi Kataoka2013-02-251-1/+6
|/ /
* | Fix an issue where voice input is not enabled by default for the secondary userSatoshi Kataoka2013-02-181-5/+12
* | Do not turn on imes unexpectedly with unit testsSatoshi Kataoka2013-01-281-15/+30
* | Add new disabled state for "optional" built-in apps.Dianne Hackborn2013-01-221-7/+36
* | Merge "Ensure that the input method dialog is dismissed when changing the har...Satoshi Kataoka2013-01-181-0/+3
|\ \
| * | Ensure that the input method dialog is dismissed when changing the hardware k...Satoshi Kataoka2013-01-181-0/+3
* | | 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
* | | Refactor utilities for InputMethodManagerSerivce that we want to share with t...Satoshi Kataoka2013-01-151-775/+62
|/ /
* | am 50fc82fd: am 30b074fc: am 2495d08a: am 5327322a: Merge "Revert "Fix a bug ...Satoshi Kataoka2013-01-111-9/+0
|\ \ | |/
| * am 2495d08a: am 5327322a: Merge "Revert "Fix a bug where disabled auxilialy I...Satoshi Kataoka2013-01-101-9/+0
| |\
| | * Revert "Fix a bug where disabled auxilialy IME is unexpectedly re-enabled"Satoshi Kataoka2013-01-101-9/+0
* | | am 5ce02267: am 7ad7b2c4: am 32b81205: Fix a bug where disabled auxilialy IME...satok2012-12-191-0/+9
|\ \ \ | |/ /
| * | am 32b81205: Fix a bug where disabled auxilialy IME is unexpectedly re-enabledsatok2012-12-191-0/+9
| |\ \ | | |/
| | * Fix a bug where disabled auxilialy IME is unexpectedly re-enabledsatok2012-12-191-0/+9
* | | resolved conflicts for merge of ebcbfb3f to masterMita Yun2012-12-101-2/+2
|\ \ \ | |/ /
| * | Use asynchronous messages for input method events.Mita Yun2012-12-061-2/+2
| |/
* | am 8ec9f8f0: am dc5b21a5: am 487f8e93: Merge "Fix an issue on installing 3rd-...satok2012-12-051-2/+4
|\ \ | |/
| * Fix an issue on installing 3rd-party IME by a non-primary usersatok2012-12-041-2/+4
* | am c86ae7cf: am 1c37b800: am 1af08411: Merge "Hide current soft input when a ...Satoshi Kataoka2012-11-271-3/+11
|\ \ | |/
| * Merge "Hide current soft input when a background user gains window focus." in...Satoshi Kataoka2012-11-261-3/+11
| |\
| | * Hide current soft input when a background user gains window focus.Satoshi Kataoka2012-11-201-3/+11