aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 975fba0c: (-s ours) am e2602eaa: Import revised translations. DO NOT MERGEEric Fischer2011-01-260-0/+0
|\ | | | | | | | | * commit '975fba0cff59fe159174077f50c8ab28b3a0f7fe': Import revised translations. DO NOT MERGE
| * am e2602eaa: Import revised translations. DO NOT MERGEEric Fischer2011-01-2642-2674/+1624
| |\ | | | | | | | | | | | | * commit 'e2602eaa6d30c65243b8bade796412ac2e66a5e2': Import revised translations. DO NOT MERGE
| | * Import revised translations. DO NOT MERGEEric Fischer2011-01-2642-2674/+1624
| | | | | | | | | | | | Change-Id: Ie4bacc79a479ab65a80c0f022bea7ad3e14f2b89
* | | am cbbe6386: am 5c35e410: Merge "Fix BroadcastReceiver leakage in ↵Tadashi G. Takaoka2011-01-262-18/+16
|\| | | | | | | | | | | | | | | | | | | | SubtypeSwitcher" into honeycomb * commit 'cbbe6386bbea5316ec63e31c758b1e8351efd5ef': Fix BroadcastReceiver leakage in SubtypeSwitcher
| * | am 5c35e410: Merge "Fix BroadcastReceiver leakage in SubtypeSwitcher" into ↵Tadashi G. Takaoka2011-01-262-18/+16
| |\| | | | | | | | | | | | | | | | | | | honeycomb * commit '5c35e4109fc5a035605605b62bf5e5a5888b0f6b': Fix BroadcastReceiver leakage in SubtypeSwitcher
| | * Merge "Fix BroadcastReceiver leakage in SubtypeSwitcher" into honeycombTadashi G. Takaoka2011-01-262-18/+16
| | |\
| | | * Fix BroadcastReceiver leakage in SubtypeSwitcherTadashi G. Takaoka2011-01-272-18/+16
| | | | | | | | | | | | | | | | | | | | Bug: 3345931 Change-Id: If31a6e803ea7e1a857085ced354722c484fda075
* | | | am 61b85f5a: am 5ecb352f: Merge "If there is no keyboard view attached, use ↵satok2011-01-261-7/+22
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | voice input view." into honeycomb * commit '61b85f5affeb51922dbcfadb38ca1e502835411f': If there is no keyboard view attached, use voice input view.
| * | | am 5ecb352f: Merge "If there is no keyboard view attached, use voice input ↵satok2011-01-261-7/+22
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | view." into honeycomb * commit '5ecb352f7f0e7e1ab4b64bcc3809471191a2f9c7': If there is no keyboard view attached, use voice input view.
| | * | Merge "If there is no keyboard view attached, use voice input view." into ↵satok2011-01-261-7/+22
| | |\ \ | | | | | | | | | | | | | | | honeycomb
| | | * | If there is no keyboard view attached, use voice input view.satok2011-01-271-7/+22
| | | |/ | | | | | | | | | | | | Change-Id: Ibf0945f3bd70f02fe0d09229fc899641567c0d4c
* | | | am c983da89: am b5e00d58: Fix NPE in isCandidateStripVisible()Ken Wakasa2011-01-261-0/+2
|\| | | | | | | | | | | | | | | | | | | * commit 'c983da89497e346667f2adb98c8bdb0947c38e43': Fix NPE in isCandidateStripVisible()
| * | | am b5e00d58: Fix NPE in isCandidateStripVisible()Ken Wakasa2011-01-261-0/+2
| |\| | | | | | | | | | | | | | | | | | * commit 'b5e00d5841b946de8970875231456228ae0eb6b1': Fix NPE in isCandidateStripVisible()
| | * | Fix NPE in isCandidateStripVisible()Ken Wakasa2011-01-271-0/+2
| | |/ | | | | | | | | | Change-Id: I03d3c4806b51e7f902c43887a6769bffbffeccaf
* | | am aedd89f1: am 5cd87e1b: Disable shortcut key when network is not availableTadashi G. Takaoka2011-01-2613-64/+151
|\| | | | | | | | | | | | | | * commit 'aedd89f1d7198ac6a5a13fdbbcfbbae87b4579d4': Disable shortcut key when network is not available
| * | am 5cd87e1b: Disable shortcut key when network is not availableTadashi G. Takaoka2011-01-2613-64/+151
| |\| | | | | | | | | | | | | * commit '5cd87e1b1c4258e8d016518914eccfbb4437cace': Disable shortcut key when network is not available
| | * Disable shortcut key when network is not availableTadashi G. Takaoka2011-01-2613-64/+151
| | | | | | | | | | | | | | | Bug: 3345931 Change-Id: I1deef774598b8e78da4404535b6d3814464a9d2d
* | | am 7fbfde52: am dc9c9790: Merge "Added voice input languages" into honeycombsatok2011-01-253-70/+44
|\| | | | | | | | | | | | | | * commit '7fbfde523ec29035cf4d7817b34bbf73a8fc7a72': Added voice input languages
| * | am dc9c9790: Merge "Added voice input languages" into honeycombsatok2011-01-253-70/+44
| |\| | | | | | | | | | | | | * commit 'dc9c979074945ff5a71c70a2c7149693bc302028': Added voice input languages
| | * Merge "Added voice input languages" into honeycombsatok2011-01-253-70/+44
| | |\
| | | * Added voice input languagessatok2011-01-263-70/+44
| | | | | | | | | | | | | | | | | | | | | | | | bug: 3382825 Change-Id: Iec031dffb86e4b05a4a718d17afe20064d14633e
* | | | am fb02bb8b: am 36113a38: Merge "Import new drawable assets" into honeycombTadashi G. Takaoka2011-01-2571-0/+2
|\| | | | | | | | | | | | | | | | | | | * commit 'fb02bb8b965066476c75b05b5c8365e3dc559f6f': Import new drawable assets
| * | | am 36113a38: Merge "Import new drawable assets" into honeycombTadashi G. Takaoka2011-01-2571-0/+2
| |\| | | | | | | | | | | | | | | | | | * commit '36113a38bedb2984be92ab9f66cb98d9fb008bff': Import new drawable assets
| | * | Merge "Import new drawable assets" into honeycombTadashi G. Takaoka2011-01-2571-0/+2
| | |\ \ | | | |/ | | |/|
| | | * Import new drawable assetsTadashi G. Takaoka2011-01-2671-0/+2
| | | | | | | | | | | | | | | | Change-Id: I0267e4e4296d127fb44d77323d7cc4eb2f63666d
* | | | am d6ce8d98: am 257b2a58: Merge "Hide recognition view when ↵satok2011-01-251-2/+12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | switchToLastInputMethod failed." into honeycomb * commit 'd6ce8d98427f221ccb4379b7c96e649fdf419acc': Hide recognition view when switchToLastInputMethod failed.
| * | | am 257b2a58: Merge "Hide recognition view when switchToLastInputMethod ↵satok2011-01-251-2/+12
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | failed." into honeycomb * commit '257b2a58d1816ac44276322a1ba7fe67ddca49b8': Hide recognition view when switchToLastInputMethod failed.
| | * | Merge "Hide recognition view when switchToLastInputMethod failed." into ↵satok2011-01-251-2/+12
| | |\ \ | | | |/ | | |/| | | | | honeycomb
| | | * Hide recognition view when switchToLastInputMethod failed.satok2011-01-251-2/+12
| | | | | | | | | | | | | | | | Change-Id: Ie5f3d267e1042b4379b51c2dc6c8756e394cfc0f
* | | | am 71aafa94: am aa0458f9: Fix Input options dialogKen Wakasa2011-01-251-3/+3
|\| | | | | | | | | | | | | | | | | | | * commit '71aafa9445c3b830b9cbe56911a91b57d25e20e3': Fix Input options dialog
| * | | am aa0458f9: Fix Input options dialogKen Wakasa2011-01-251-3/+3
| |\| | | | | | | | | | | | | | | | | | * commit 'aa0458f917bb823efab6245f08c65e8f2f7327ac': Fix Input options dialog
| | * | Fix Input options dialogKen Wakasa2011-01-261-3/+3
| | | | | | | | | | | | | | | | | | | | bug: 3387860 Change-Id: I81e57ca08e07e4c2a68196ca173b764c40fbeb17
* | | | am 8e13c338: am e5ce433a: Check second down event of double tap is on shift keyTadashi G. Takaoka2011-01-252-15/+25
|\| | | | | | | | | | | | | | | | | | | * commit '8e13c338afce490197d799fd86bc7bef3057b79b': Check second down event of double tap is on shift key
| * | | am e5ce433a: Check second down event of double tap is on shift keyTadashi G. Takaoka2011-01-252-15/+25
| |\| | | | | | | | | | | | | | | | | | * commit 'e5ce433a9ef9dc3d8261e82a5543f80d7ebc50bd': Check second down event of double tap is on shift key
| | * | Check second down event of double tap is on shift keyTadashi G. Takaoka2011-01-252-15/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This change also removes unnecessary touch point tweaks. Bug: 3385404 Change-Id: Ic398268ec4fcfaa9eafe8a70f2d10c2cd1fdfc62
* | | | resolved conflicts for merge of f73d2386 to masterTadashi G. Takaoka2011-01-265-271/+9
|\| | | | | | | | | | | | | | | Change-Id: I3f7d3cf35e5df888e397e61acc9786972a1fda4c
| * | | am 6d0ff1d0: Merge "Revert "Implement callback to handle touch event outside ↵Ken Wakasa2011-01-255-264/+9
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | SoftInputWindow"" into honeycomb * commit '6d0ff1d070584cd30753b7425be39fc578f198c3': Revert "Implement callback to handle touch event outside SoftInputWindow"
| | * | Merge "Revert "Implement callback to handle touch event outside ↵Ken Wakasa2011-01-255-264/+9
| | |\ \ | | | | | | | | | | | | | | | SoftInputWindow"" into honeycomb
| | | * | Revert "Implement callback to handle touch event outside SoftInputWindow"Tadashi G. Takaoka2011-01-255-264/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit de59a84029d3d3ec114b5b0f2eca0b3752982fef (Ie8d4469b). The requested feature has been implemented by I92d98bed. Bug: 3238092 Change-Id: I9d53030b3d5c9a0f24883292a93576a3231813aa
* | | | | am e16e692f: am 3b46ae53: Merge "Automatically layout mini keyboard" into ↵Ken Wakasa2011-01-2520-196/+578
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | honeycomb * commit 'e16e692fa4cd1a52fe1e4f4ad07786fddefe7829': Automatically layout mini keyboard
| * | | | am 3b46ae53: Merge "Automatically layout mini keyboard" into honeycombKen Wakasa2011-01-2520-196/+578
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit '3b46ae535f673d3efd489c087281e02c2ff4e575': Automatically layout mini keyboard
| | * | | Merge "Automatically layout mini keyboard" into honeycombKen Wakasa2011-01-2520-196/+578
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Automatically layout mini keyboardTadashi G. Takaoka2011-01-2520-196/+578
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 2214959 Change-Id: I06370e1c9e0683666ad19454a2fb501008af95c0
* | | | | am 302e5b3c: am 099b4dc6: Merge "Avoid disk writes on UI thread." into honeycombsatok2011-01-251-2/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '302e5b3cfd2283dabcab68d34f3709e044f522e6': Avoid disk writes on UI thread.
| * | | | am 099b4dc6: Merge "Avoid disk writes on UI thread." into honeycombsatok2011-01-251-2/+9
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit '099b4dc6ec4cf727e88ebea2a3d88b1ecc0ae55a': Avoid disk writes on UI thread.
| | * | | Merge "Avoid disk writes on UI thread." into honeycombsatok2011-01-251-2/+9
| | |\ \ \
| | | * | | Avoid disk writes on UI thread.satok2011-01-251-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0a498e47afb2c9a5241e2f329c39e266550135a5
* | | | | | am 33dd2620: am 15638aec: Show the value of the "Show suggestions" option in ↵Jean Chalard2011-01-251-0/+12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | summary. * commit '33dd262084d33e9b35f5f27b1841d393b043a78d': Show the value of the "Show suggestions" option in summary.
| * | | | | am 15638aec: Show the value of the "Show suggestions" option in summary.Jean Chalard2011-01-251-0/+12
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '15638aec336139e05c2f91140da69fe6d7b4c307': Show the value of the "Show suggestions" option in summary.
| | * | | | Show the value of the "Show suggestions" option in summary.Jean Chalard2011-01-251-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Have the "Show correction suggestions" option display its value in its description. Bug: 3282448 Change-Id: Id76b5032ed5776d0567e1679d2a74ee758045919