aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | am 8537026d: (-s ours) Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-09-120-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8537026d45929affb9b201320c32e295e5d37852':
| * | | | | | | Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-09-120-0/+0
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | | | | | | | | Change-Id: Id2ab069a952f0872441fc02a89e26fd71ede249a
| | * | | | | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-120-0/+0
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | * | | | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-100-0/+0
| | | |\ \ \ \ \
| | | | * \ \ \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-090-0/+0
| | | | |\ \ \ \ \
* | | | | | | | | | am 181a9861: am 18fc3bf4: Merge "Make Latin IME aware of its surrounding ↵Jean Chalard2012-09-122-9/+203
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | text." into jb-mr1-dev * commit '181a9861b1815fafca3cbbf48abbd91e821986b6': Make Latin IME aware of its surrounding text.
| * | | | | | | | | am 18fc3bf4: Merge "Make Latin IME aware of its surrounding text." into ↵Jean Chalard2012-09-122-9/+203
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1-dev * commit '18fc3bf4c453fe106be254eeb7aefb4a4a7154ba': Make Latin IME aware of its surrounding text.
| | * | | | | | | | Merge "Make Latin IME aware of its surrounding text." into jb-mr1-devJean Chalard2012-09-122-9/+203
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Make Latin IME aware of its surrounding text.Jean Chalard2012-09-122-9/+203
| | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a preparatory change for Bug: 4967874 Bug: 6617760 Bug: 6950087 Change-Id: I3abf8e45c0d02c42491421f108370220134b9602
* | | | | | | | | | am f602b7ca: am 57e95111: Merge "Use offscreen bitmap buffer to draw gesture ↵Tadashi G. Takaoka2012-09-123-24/+55
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | preview trail" into jb-mr1-dev * commit 'f602b7caed8c314a854545813ec6a6c0c4c89ab9': Use offscreen bitmap buffer to draw gesture preview trail
| * | | | | | | | | am 57e95111: Merge "Use offscreen bitmap buffer to draw gesture preview ↵Tadashi G. Takaoka2012-09-123-24/+55
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | trail" into jb-mr1-dev * commit '57e95111138c94b7db7fec6749ca42be9fe92b2e': Use offscreen bitmap buffer to draw gesture preview trail
| | * | | | | | | | Merge "Use offscreen bitmap buffer to draw gesture preview trail" into ↵Tadashi G. Takaoka2012-09-123-24/+55
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1-dev
| | | * | | | | | | | Use offscreen bitmap buffer to draw gesture preview trailTadashi G. Takaoka2012-09-123-24/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7042741 Change-Id: Ie3d7054e786938dc501c7aa2ffc96b5924a7967b
* | | | | | | | | | | am ec2039aa: am 8d031a63: Add put method to FusionDictionaryBufferInterface.Yuichiro Hanada2012-09-122-0/+11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ec2039aa66168c475a703e3c4e0798845a948db2': Add put method to FusionDictionaryBufferInterface.
| * | | | | | | | | | am 8d031a63: Add put method to FusionDictionaryBufferInterface.Yuichiro Hanada2012-09-122-0/+11
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8d031a63b4d59d4d8670b4310dd9e18a0e03435a': Add put method to FusionDictionaryBufferInterface.
| | * | | | | | | | | Add put method to FusionDictionaryBufferInterface.Yuichiro Hanada2012-09-122-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iac0b35d2da05e81237d105e8fe13c56d16038de1
* | | | | | | | | | | am 36a671ac: am 9182daf9: Output detailed log in ProximityInfoStateSatoshi Kataoka2012-09-121-0/+21
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '36a671ac9719f1b1f092d804a74cc261d8ec54b9': Output detailed log in ProximityInfoState
| * | | | | | | | | | am 9182daf9: Output detailed log in ProximityInfoStateSatoshi Kataoka2012-09-111-0/+21
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9182daf98c0d1db897e82b77c2196b7f9aad6f01': Output detailed log in ProximityInfoState
| | * | | | | | | | | Output detailed log in ProximityInfoStateSatoshi Kataoka2012-09-121-0/+21
| | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If6a254e2a116d1b6812f448d38139b7656168be6
* | | | | | | | | | am 13e2b053: am 64c65ce6: Add missing MoreKeySpec.hashCodeTadashi G. Takaoka2012-09-121-1/+26
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '13e2b0539517aff08d23f5f8af1e833c7b7af18e': Add missing MoreKeySpec.hashCode
| * | | | | | | | | am 64c65ce6: Add missing MoreKeySpec.hashCodeTadashi G. Takaoka2012-09-111-1/+26
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '64c65ce6d780175fe606fdd7ee694a3b5af4e37f': Add missing MoreKeySpec.hashCode
| | * | | | | | | | Add missing MoreKeySpec.hashCodeTadashi G. Takaoka2012-09-121-1/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7149235 Change-Id: I14ba1017dffccc690e24289052a3ad7265a5f5f7
* | | | | | | | | | am 6e52f164: am 655be140: Merge "When Accessibility is on, intercept touch ↵Charles Chen2012-09-122-8/+13
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | events during dispatch." into jb-mr1-dev * commit '6e52f164e6c7f5ed4f374d79b45a5665ee3d263b': When Accessibility is on, intercept touch events during dispatch.
| * | | | | | | | | am 655be140: Merge "When Accessibility is on, intercept touch events during ↵Charles Chen2012-09-112-8/+13
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dispatch." into jb-mr1-dev * commit '655be140a0df4eaeee6789a0a14b765881c46748': When Accessibility is on, intercept touch events during dispatch.
| | * | | | | | | | Merge "When Accessibility is on, intercept touch events during dispatch." ↵Charles Chen2012-09-112-8/+13
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-mr1-dev
| | | * | | | | | | | When Accessibility is on, intercept touch events during dispatch.alanv2012-09-102-8/+13
| | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows Accessibility code to safely inject events into onTouchEvent() without accidentally intercepting them. Bug: 7137557 Change-Id: Ie4fa8e3be5b1bb84f57c6254feab1129cb89998f
* | | | | | | | | | am 5d46fb59: am e30c4e0b: Stabilize gesture recognition algorithm that looks ↵Ken Wakasa2012-09-122-5/+12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for the nearest key. * commit '5d46fb59d4b3d8c1dd37b8177dc3aed812c28c08': Stabilize gesture recognition algorithm that looks for the nearest key.
| * | | | | | | | | am e30c4e0b: Stabilize gesture recognition algorithm that looks for the ↵Ken Wakasa2012-09-112-5/+12
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nearest key. * commit 'e30c4e0bb1522f45b3bb37b54c35ee1f6a21dd4b': Stabilize gesture recognition algorithm that looks for the nearest key.
| | * | | | | | | | Stabilize gesture recognition algorithm that looks for the nearest key.Ken Wakasa2012-09-112-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It relies on the order of the key array. Change-Id: I58fa71a7b330e59cd774fc208e5b6bc1a3decd2e
* | | | | | | | | | am 28892e6e: am b0c693d0: Merge "Stop auto-correcting non-whitelisted ↵Jean Chalard2012-09-122-5/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | one-char strings" into jb-mr1-dev * commit '28892e6e6569440530e6cbf7caf882f75dc3acac': Stop auto-correcting non-whitelisted one-char strings
| * | | | | | | | | am b0c693d0: Merge "Stop auto-correcting non-whitelisted one-char strings" ↵Jean Chalard2012-09-112-5/+7
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-mr1-dev * commit 'b0c693d005761dc2d2c2e323cc0456bac9a33297': Stop auto-correcting non-whitelisted one-char strings
| | * | | | | | | | Merge "Stop auto-correcting non-whitelisted one-char strings" into jb-mr1-devJean Chalard2012-09-112-5/+7
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Stop auto-correcting non-whitelisted one-char stringsJean Chalard2012-09-112-5/+7
| | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7134017 Change-Id: I75cf474dedafda3e1683dd8f7740c13aafdcf5ab
* | | | | | | | | | am 3e53c6d9: am 040f1c50: Merge "Debug flag" into jb-mr1-devSatoshi Kataoka2012-09-122-2/+14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3e53c6d97080fbbd9b09a2d67fb8f933dc5c872b': Debug flag
| * | | | | | | | | am 040f1c50: Merge "Debug flag" into jb-mr1-devSatoshi Kataoka2012-09-112-2/+14
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '040f1c50bf2d105b75cb61cac883d6955b955f8e': Debug flag
| | * | | | | | | | Merge "Debug flag" into jb-mr1-devSatoshi Kataoka2012-09-112-2/+14
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Debug flagSatoshi Kataoka2012-09-112-2/+14
| | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ied846162fd5052a33fd3c8596e73dfdd48c446ee
* | | | | | | | | | am 296d7f31: am 41c2765b: Remove an unused file.Ken Wakasa2012-09-121-71/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '296d7f31d3a3fcd3d0c3d51864b391d9b380b2ab': Remove an unused file.
| * | | | | | | | | am 41c2765b: Remove an unused file.Ken Wakasa2012-09-101-71/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '41c2765b4499b093f1a4b4cba244cb384002037b': Remove an unused file.
| | * | | | | | | | Remove an unused file.Ken Wakasa2012-09-111-71/+0
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I422d27aae063c4eb17d0e00277cf4492e5b4986e
* | | | | | | | | am 484aa517: am 29352761: Merge "Add debug utils for geometric input" into ↵Satoshi Kataoka2012-09-101-0/+20
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1-dev * commit '484aa5174ea9a9899591704bf5f2c35c24783485': Add debug utils for geometric input
| * | | | | | | | am 29352761: Merge "Add debug utils for geometric input" into jb-mr1-devSatoshi Kataoka2012-09-101-0/+20
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2935276110cf3588e2986b833cc78a7bab6253cc': Add debug utils for geometric input
| | * | | | | | | Merge "Add debug utils for geometric input" into jb-mr1-devSatoshi Kataoka2012-09-101-0/+20
| | |\ \ \ \ \ \ \
| | | * | | | | | | Add debug utils for geometric inputSatoshi Kataoka2012-09-101-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If01bd5593cfc7428572aa43253d6d72409ac6b8e
* | | | | | | | | | am 01a9801f: am c80b3a29: Merge "Add DEBUG_GEO_FULL flag" into jb-mr1-devSatoshi Kataoka2012-09-101-0/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '01a9801fcf8f5ab491405b1240319f0120063087': Add DEBUG_GEO_FULL flag
| * | | | | | | | | am c80b3a29: Merge "Add DEBUG_GEO_FULL flag" into jb-mr1-devSatoshi Kataoka2012-09-101-0/+4
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c80b3a29a872e41c2cdc0532e0496db8c8eff64d': Add DEBUG_GEO_FULL flag
| | * | | | | | | | Merge "Add DEBUG_GEO_FULL flag" into jb-mr1-devSatoshi Kataoka2012-09-101-0/+4
| | |\| | | | | | |
| | | * | | | | | | Add DEBUG_GEO_FULL flagSatoshi Kataoka2012-09-101-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibf8eb5fc2056fd138e9e6af1c13fbc065b44a6f1
* | | | | | | | | | am 299c3292: am 32e85fda: Merge "Have makedict support the new file format." ↵Jean Chalard2012-09-101-27/+21
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-mr1-dev * commit '299c32929e5712c1beaca83294866518715ecf1d': Have makedict support the new file format.
| * | | | | | | | | am 32e85fda: Merge "Have makedict support the new file format." into jb-mr1-devJean Chalard2012-09-101-27/+21
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '32e85fdacfb4c865c7e1565d80697e97e21f3484': Have makedict support the new file format.