aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Kill the process when the debug mode is updated.Jean Chalard2011-02-031-0/+10
| | | | | | | Killing the process allows for some settings that are read only on service start up to be correctly read again. Change-Id: Ia48f2ca4760a530ac47b727f290d606715cb6bde
* Fix menu option dialog orderTadashi G. Takaoka2011-02-031-2/+2
| | | | Change-Id: Iea619d26a2f2091b71182face2f6a66d188e0287
* am 99b55726: (-s ours) am 620e6576: Manual revert of manually translated ↵Ken Wakasa2011-02-010-0/+0
|\ | | | | | | | | | | | | Spanish strings. DO NOT MERGE. * commit '99b55726162852fa1811904f2355d70b6b46695f': Manual revert of manually translated Spanish strings. DO NOT MERGE.
| * am 620e6576: Manual revert of manually translated Spanish strings. DO NOT MERGE.Ken Wakasa2011-02-011-10/+5
| |\ | | | | | | | | | | | | * commit '620e657662265c487ac8085f73ee9935bc97ed11': Manual revert of manually translated Spanish strings. DO NOT MERGE.
| | * Manual revert of manually translated Spanish strings. DO NOT MERGE.Ken Wakasa2011-02-011-10/+5
| | | | | | | | | | | | | | | | | | They were overwritten and got lost by I6de9aa76 Change-Id: I4b9505ea9e4d57e22ed078e0ec85efe585757b5e
* | | am 0b8d750d: (-s ours) am fc16caf5: Import revised translations. DO NOT ↵Eric Fischer2011-02-010-0/+0
|\| | | | | | | | | | | | | | | | | | | | MERGE. Bug 3394542 * commit '0b8d750d12298d9092e91fb3b2445ab9cd589dd9': Import revised translations. DO NOT MERGE. Bug 3394542
| * | am fc16caf5: Import revised translations. DO NOT MERGE. Bug 3394542Eric Fischer2011-01-3140-1196/+1184
| |\| | | | | | | | | | | | | * commit 'fc16caf56a342eee7c2161ffa181375389a71d46': Import revised translations. DO NOT MERGE. Bug 3394542
| | * Import revised translations. DO NOT MERGE. Bug 3394542Eric Fischer2011-01-3140-1196/+1184
| | | | | | | | | | | | Change-Id: I6de9aa765cdfeb34fba0ae5fae8d7f92102125de
* | | Merge "Cleanup keyboard drawing code"Tadashi G. Takaoka2011-02-013-88/+29
|\ \ \
| * | | Cleanup keyboard drawing codeTadashi G. Takaoka2011-02-013-88/+29
| | | | | | | | | | | | | | | | Change-Id: I084e3ac835ee60b8e463ac10c075adbf08b9a7cb
* | | | Merge "Add debugging info for Latin IME."Jean Chalard2011-01-312-8/+38
|\ \ \ \
| * | | | Add debugging info for Latin IME.Jean Chalard2011-02-012-8/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add frequency of candidates in the candidates view when the debug mode is active. Bug: 3312867 Change-Id: Ie911f14ef11b2fa02af8f3a74302129f16ed0604
* | | | | Merge "Use custom dialog builder building url link clickable from service"Tadashi G. Takaoka2011-01-311-72/+58
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Use custom dialog builder building url link clickable from serviceTadashi G. Takaoka2011-02-011-72/+58
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | This change is derived from I7611ebc1 (Honeycomb). Bug: 3246715 Change-Id: I6446bd785f1bd3d7b901e86661c91ca5a823f30e
* | | | am c8ec9be9: (-s ours) am 10ac7392: (-s ours) am b43200c1: Import revised ↵Eric Fischer2011-01-310-0/+0
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | translations. DO NOT MERGE * commit 'c8ec9be92a10a57379ecf1c6cf14a4271cc7a717': Import revised translations. DO NOT MERGE
| * | am 10ac7392: (-s ours) am b43200c1: Import revised translations. DO NOT MERGEEric Fischer2011-01-310-0/+0
| |\ \ | | | | | | | | | | | | | | | | * commit '10ac73923ab0d67fa863ddcc83389a772299d2f1': Import revised translations. DO NOT MERGE
| | * \ am b43200c1: Import revised translations. DO NOT MERGEEric Fischer2011-01-3119-35/+35
| | |\ \ | | | | | | | | | | | | | | | | | | | | * commit 'b43200c105e730a089798f4e51261c5381dd6536': Import revised translations. DO NOT MERGE
| | | * | Import revised translations. DO NOT MERGEEric Fischer2011-01-3119-35/+35
| | | | | | | | | | | | | | | | | | | | Change-Id: I19645baeeb40b0bc10cf656581ff7f6b7be851d4
* | | | | Merge "Fix subtype settings activity string"Ken Wakasa2011-01-311-1/+3
|\ \ \ \ \
| * | | | | Fix subtype settings activity stringKen Wakasa2011-02-011-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | original (abandoned) change: I78463bbb Change-Id: I1ef4df882fb09dd31a77e8f12d30d03460ecaada
* | | | | | am 7b6cdacf: am 72811549: Do not read the pop up setting if the config says ↵Jean Chalard2011-01-301-2/+10
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | not to. * commit '7b6cdacf4d36fa7ab21a98a95b9d44882886c890': Do not read the pop up setting if the config says not to.
| * | | | | am 72811549: Do not read the pop up setting if the config says not to.Jean Chalard2011-01-301-2/+10
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | * commit '728115493e14f84d5f02a4812c8086a378813364': Do not read the pop up setting if the config says not to.
| | * | | | Do not read the pop up setting if the config says not to.Jean Chalard2011-01-311-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the configuration says the device should not display the "Pop up on key press" setting, then do not read the preference and always use the default setting. bug: 3406181 Change-Id: Ice2989760cda1d40387ed88311144cbf2c114b93
* | | | | | am 20e3e036: am d6cac41d: Merge "Fixing colon key alignment Bug: 3362749 ↵Justin Ho2011-01-308-0/+0
|\| | | | | | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Bug: 3405016 Change-Id: Ie6f15a5a8f27d0df517b451e93a92cc693b9fcd6" into honeycomb * commit '20e3e0362804e1ba9fa0db7a9514005480a0f33a': Fixing colon key alignment Bug: 3362749 Bug: 3405016 Change-Id: Ie6f15a5a8f27d0df517b451e93a92cc693b9fcd6
| * | | | am d6cac41d: Merge "Fixing colon key alignment Bug: 3362749 Bug: 3405016 ↵Justin Ho2011-01-308-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie6f15a5a8f27d0df517b451e93a92cc693b9fcd6" into honeycomb * commit 'd6cac41dc7f9992c9c7ceaf9caec61d714be0742': Fixing colon key alignment Bug: 3362749 Bug: 3405016 Change-Id: Ie6f15a5a8f27d0df517b451e93a92cc693b9fcd6
| | * | | Merge "Fixing colon key alignment Bug: 3362749 Bug: 3405016 Change-Id: ↵Justin Ho2011-01-308-0/+0
| | |\ \ \ | | | | | | | | | | | | | | | | | | Ie6f15a5a8f27d0df517b451e93a92cc693b9fcd6" into honeycomb
| | | * | | Fixing colon key alignmentJustin Ho2011-01-3016-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 3362749 Bug: 3405016 Change-Id: Ie6f15a5a8f27d0df517b451e93a92cc693b9fcd6
* | | | | | am 4f5ddf03: Reconcile gingerbread-plus-aosp and honeycombThe Android Open Source Project2011-01-300-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '4f5ddf036aac6dffba8194055a01957f35bc0285':
| * | | | | Reconcile gingerbread-plus-aosp and honeycombThe Android Open Source Project2011-01-300-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibeb0a92c87bd7fddb7f8242dc0a3d1875c29c251
| | * | | | Mass merge from gingerbread - do not mergeThe Android Open Source Project2011-01-300-0/+0
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Change-Id: I283edea7175253ff92e8d8d66c4182606baf42bf
| | | * \ \ \ am 466e991c: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-01-290-0/+0
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| | | | | | | | | | | | | | | | * commit '466e991caf463bb2affe4c520eee99d7838e83c1': Import revised translations. DO NOT MERGE
| | | * | | | am 5d8633d2: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-01-290-0/+0
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5d8633d229316762d95346867e8fda1fb34d0ec8': Import revised translations. DO NOT MERGE
| | | * \ \ \ \ am 07a0fd0f: (-s ours) Reset old keyboard state before switching to new ↵Tadashi G. Takaoka2011-01-260-0/+0
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | keyboard (DO NOT MERGE) * commit '07a0fd0f5100a0cee978ba07751d63595c9d27ac': Reset old keyboard state before switching to new keyboard (DO NOT MERGE)
| | | * \ \ \ \ \ am 4246861c: (-s ours) Merge "Import translations for additional languages." ↵Eric Fischer2011-01-250-0/+0
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread * commit '4246861c60e6ea5a719991c8bc1c0c9461eb44d7': Import translations for additional languages.
* | | | | | | | | | am ddc6eb10: (-s ours) am 8184a3d4: (-s ours) am 466e991c: Import revised ↵Eric Fischer2011-01-290-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit 'ddc6eb103e569b3f110b98b2754bdf0dc1b8f72c': Import revised translations. DO NOT MERGE
| * | | | | | | | | am 8184a3d4: (-s ours) am 466e991c: Import revised translations. DO NOT MERGEEric Fischer2011-01-290-0/+0
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8184a3d41603e920ec3ec086a16f39b37b04a9a4': Import revised translations. DO NOT MERGE
| | * | | | | | | | am 466e991c: Import revised translations. DO NOT MERGEEric Fischer2011-01-285-13/+13
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | * commit '466e991caf463bb2affe4c520eee99d7838e83c1': Import revised translations. DO NOT MERGE
| | | * | | | | | | Import revised translations. DO NOT MERGEEric Fischer2011-01-285-13/+13
| | | | |_|_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia637306742c58cc5d38fa0fe28e31589fc6fb33a
* | | | | | | | | am 969c014b: (-s ours) am 0d542b48: (-s ours) am 5d8633d2: Import revised ↵Eric Fischer2011-01-290-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit '969c014b0768d3445ef4f4a1519908e29e41f182': Import revised translations. DO NOT MERGE
| * | | | | | | | am 0d542b48: (-s ours) am 5d8633d2: Import revised translations. DO NOT MERGEEric Fischer2011-01-290-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0d542b48f5299990df9fb81c538bd22bdc64881b': Import revised translations. DO NOT MERGE
| | * | | | | | | am 5d8633d2: Import revised translations. DO NOT MERGEEric Fischer2011-01-2718-37/+37
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5d8633d229316762d95346867e8fda1fb34d0ec8': Import revised translations. DO NOT MERGE
| | | * | | | | | Import revised translations. DO NOT MERGEEric Fischer2011-01-2718-37/+37
| | | | |_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | Change-Id: I5f2aa49d7602a597a4a5308ae4d352f8b6004504
* | | | | | | | am 7c355c69: am e80c070c: Merge "Updated + key" into honeycombKen Wakasa2011-01-298-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7c355c698d3776cf8e14dc9e1a438a7b2c3dbfee': Updated + key
| * | | | | | | am e80c070c: Merge "Updated + key" into honeycombKen Wakasa2011-01-298-0/+0
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | * commit 'e80c070c7d10d2dde299dfe72c2dfbbc699a3e69': Updated + key
| | * | | | | | Merge "Updated + key" into honeycombKen Wakasa2011-01-298-0/+0
| | |\ \ \ \ \ \
| | | * | | | | | Updated + keyJustin Ho2011-01-288-0/+0
| | | | |_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 3401855 Change-Id: Ib5e67d0038b7e89ecdf3b652ac0719e96bf4ab2f
* | | | | | | | am d3017c71: (-s ours) am fe97647f: Import revised translations. DO NOT MERGEEric Fischer2011-01-280-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd3017c7120bcb7b16173bbb5dc68a74e6d5de13d': Import revised translations. DO NOT MERGE
| * | | | | | | am fe97647f: Import revised translations. DO NOT MERGEEric Fischer2011-01-2810-75/+75
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fe97647f1b1d96990ed8557b9dc7082bfd8f8d11': Import revised translations. DO NOT MERGE
| | * | | | | | Import revised translations. DO NOT MERGEEric Fischer2011-01-2810-75/+75
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | Change-Id: I87042810bd939cf3c83a97034c8f1fda99cdd534
* | | | | | | am e820fdfe: am 063a98a7: Merge "Reuse keyboard view\'s drawing bitmap if ↵Ken Wakasa2011-01-271-2/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | possible" into honeycomb * commit 'e820fdfeb045a7c61c971532578ed02144b5c3e6': Reuse keyboard view's drawing bitmap if possible