aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | am e2ac3932: Merge "Allow one-character suggestions." into jb-mr1-devJean Chalard2012-08-164-42/+35
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e2ac3932e390590fca7a3814556331db6a08362c': Allow one-character suggestions.
| | * | | | | | | Merge "Allow one-character suggestions." into jb-mr1-devJean Chalard2012-08-164-42/+35
| | |\ \ \ \ \ \ \
| | | * | | | | | | Allow one-character suggestions.Jean Chalard2012-08-174-42/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6906525 Change-Id: I62117653ac1281f825afc4ebb30f7e786902b750
* | | | | | | | | | am 97652731: (-s ours) Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-08-160-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '97652731272a54eb318d835387e73c325440dcd0':
| * | | | | | | | | Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-08-160-0/+0
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | Change-Id: I12ca58a05a6640c7db80f88ce271131f164fed10
| | * | | | | | | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-160-0/+0
| | |\ \ \ \ \ \ \ \
* | | | | | | | | | | am 7145ca71: am 228674f6: Merge "fix findWordInTree." into jb-mr1-devJean Chalard2012-08-162-0/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7145ca713854d090eb5c3ceeb588748f575764e3': fix findWordInTree.
| * | | | | | | | | | am 228674f6: Merge "fix findWordInTree." into jb-mr1-devJean Chalard2012-08-162-0/+7
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '228674f6c7ce8891ca6b358db94da921712d9960': fix findWordInTree.
| | * | | | | | | | | Merge "fix findWordInTree." into jb-mr1-devJean Chalard2012-08-162-0/+7
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | |
| | | * | | | | | | | fix findWordInTree.Yuichiro Hanada2012-08-172-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8f42df28f76188677db9d4e55885e1fc6a40b53f
* | | | | | | | | | | am 0d2cece0: am 3083b4b7: Merge "Fix a debug method" into jb-mr1-devJean Chalard2012-08-162-3/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0d2cece02d3bdafa54d3dcf5abf344a71f3a5eaa': Fix a debug method
| * | | | | | | | | | am 3083b4b7: Merge "Fix a debug method" into jb-mr1-devJean Chalard2012-08-162-3/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3083b4b77d51b28749a819d4e01a09ec558956e4': Fix a debug method
| | * | | | | | | | | Merge "Fix a debug method" into jb-mr1-devJean Chalard2012-08-162-3/+3
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Fix a debug methodJean Chalard2012-08-172-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Icf78fb0d5f7caea78f053fffd1ecd4289629964a
* | | | | | | | | | | | am cd4c6c4d: (-s ours) am a07590a8: Import translations. DO NOT MERGEBaligh Uddin2012-08-160-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cd4c6c4d2114a069f7e49dfaa854baef9916c2e4': Import translations. DO NOT MERGE
| * | | | | | | | | | | am a07590a8: Import translations. DO NOT MERGEBaligh Uddin2012-08-163-0/+789
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a07590a81c270c5843237f8edb4f58f6f4fabd8a': Import translations. DO NOT MERGE
| | * | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2012-08-163-0/+789
| | | |_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5d02e55780596d25356a602027f3c41913057810 Auto-generated-cl: translation import
* | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2012-08-163-0/+789
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If62326777fb4a3c9596135cf07bc1361330ee849 Auto-generated-cl: translation import
* | | | | | | | | | | am 5b0c0e55: am bc44ad77: Merge "fix findWordInTree." into jb-mr1-devKen Wakasa2012-08-162-1/+52
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5b0c0e5519918d52db72f522336080ed8e9311b0': fix findWordInTree.
| * | | | | | | | | | am bc44ad77: Merge "fix findWordInTree." into jb-mr1-devKen Wakasa2012-08-162-1/+52
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'bc44ad77e50a9f5ca2dab2c5153971b23c33fa2c': fix findWordInTree.
| | * | | | | | | | | Merge "fix findWordInTree." into jb-mr1-devKen Wakasa2012-08-162-1/+52
| | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | |
| | | * | | | | | | | fix findWordInTree.Yuichiro Hanada2012-08-162-1/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9d81c815494a0670afa81219ad7bad82274d997e
* | | | | | | | | | | am 0acb1326: am fee0ac60: Cleanup and fix method visibility.Ken Wakasa2012-08-164-95/+92
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0acb13266988c1c582f1ce2ba26252e76702b607': Cleanup and fix method visibility.
| * | | | | | | | | | am fee0ac60: Cleanup and fix method visibility.Ken Wakasa2012-08-164-95/+92
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fee0ac60b1cd0a4760ca8f310ff8a86b925d833b': Cleanup and fix method visibility.
| | * | | | | | | | | Cleanup and fix method visibility.Ken Wakasa2012-08-164-95/+92
| | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia9e8c69da21ce22bf674ec6c7b2536008a360ea3
* | | | | | | | | | am 73946166: (-s ours) Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-08-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '73946166007738852836243276d1f9041912dd89':
| * | | | | | | | | Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-08-150-0/+0
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | Change-Id: I3f51f6d0028015c72222250ba7521bbb169f4f7c
| | * | | | | | | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-150-0/+0
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | | * | | | | | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-140-0/+0
| | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-130-0/+0
| | | | |\ \ \ \ \ \ \
* | | | | | | | | | | | am e6e64e11: am 4bf2c070: Merge "Step 30-A Constize gesture" into jb-mr1-devSatoshi Kataoka2012-08-157-11/+14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e6e64e11d43cb2320a1fbef0ab8c87c32206657a': Step 30-A Constize gesture
| * | | | | | | | | | | am 4bf2c070: Merge "Step 30-A Constize gesture" into jb-mr1-devSatoshi Kataoka2012-08-157-11/+14
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4bf2c0703440a0c668ec071c36e82dd02d5caf30': Step 30-A Constize gesture
| | * | | | | | | | | | Merge "Step 30-A Constize gesture" into jb-mr1-devSatoshi Kataoka2012-08-157-11/+14
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Step 30-A Constize gestureSatoshi Kataoka2012-08-157-11/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6c0b89d96532dc1c8ca71bb730ba22de5592ec67
* | | | | | | | | | | | | am e3884b04: am 91c64902: Merge "Refresh editor info when the text field ↵Jean Chalard2012-08-153-5/+17
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | attributes changes." into jb-mr1-dev * commit 'e3884b041d24fb3dd4f9b53ddfb86cace75b450a': Refresh editor info when the text field attributes changes.
| * | | | | | | | | | | | am 91c64902: Merge "Refresh editor info when the text field attributes ↵Jean Chalard2012-08-153-5/+17
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changes." into jb-mr1-dev * commit '91c64902b038976ae44d69dae7818f2c7adde863': Refresh editor info when the text field attributes changes.
| | * | | | | | | | | | | Merge "Refresh editor info when the text field attributes changes." into ↵Jean Chalard2012-08-153-5/+17
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1-dev
| | | * | | | | | | | | | | Refresh editor info when the text field attributes changes.Jean Chalard2012-08-153-5/+17
| | | | |_|_|_|/ / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For some reason we get a "restarting" flag from the browser some times when the input field is different. The attributes however are not the same, so we can detect that and reload appropriately. Bug: 6946793 Change-Id: I6762dae6f41db690497b026a707d9cc89c840b34
* | | | | | | | | | | | | am 5252ca77: am cd0e0048: Merge "Ensure #offer always actually offers ↵Jean Chalard2012-08-152-3/+29
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | something." into jb-mr1-dev * commit '5252ca773f9f5ce1ddd8afe423850c64834ba1a0': Ensure #offer always actually offers something.
| * | | | | | | | | | | | am cd0e0048: Merge "Ensure #offer always actually offers something." into ↵Jean Chalard2012-08-152-3/+29
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1-dev * commit 'cd0e0048881eb854a4d1524c2d54d6b9bb00f614': Ensure #offer always actually offers something.
| | * | | | | | | | | | | Merge "Ensure #offer always actually offers something." into jb-mr1-devJean Chalard2012-08-152-3/+29
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | | | | | | |
| | | * | | | | | | | | | Ensure #offer always actually offers something.Jean Chalard2012-08-152-3/+29
| | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will allow remaining requests after a call to terminate correctly. Bug: 6963142 Change-Id: Iff67058bb8a39f2f1b468d3894861e8125de6659
* | | | | | | | | | | | am 258eaa48: am 3979f060: Step 28-A Introduce the session Id to getSuggestionSatoshi Kataoka2012-08-144-10/+56
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '258eaa48b4b7921a712dab24640273fd3e6c1efc': Step 28-A Introduce the session Id to getSuggestion
| * | | | | | | | | | | am 3979f060: Step 28-A Introduce the session Id to getSuggestionSatoshi Kataoka2012-08-144-10/+56
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3979f060f0650cbc117eee0307d05fb0be78c6f2': Step 28-A Introduce the session Id to getSuggestion
| | * | | | | | | | | | Step 28-A Introduce the session Id to getSuggestionSatoshi Kataoka2012-08-154-10/+56
| | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I39d9bf1a7c272eb16d6ed4698f52457579b40f10
* | | | | | | | | | | am 641373b7: am 05384933: Fix the build.alanv2012-08-141-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '641373b7356cb874b8bd413d49f2840abe026260': Fix the build.
| * | | | | | | | | | am 05384933: Fix the build.alanv2012-08-141-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '05384933097c1e9c35e8be5c03757d072e5ffa46': Fix the build.
| | * | | | | | | | | Fix the build.alanv2012-08-141-1/+1
| | | |_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I744f6232e81981ab694d3d1e92bab5fd6efa46c0
* | | | | | | | | | am af0a0884: am dd7f7909: Merge "Change accessibility event type for ↵Charles Chen2012-08-143-10/+29
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | app-driven speech." into jb-mr1-dev * commit 'af0a0884463420b1a4e75780ba2b3eacae21c5ff': Change accessibility event type for app-driven speech.
| * | | | | | | | | am dd7f7909: Merge "Change accessibility event type for app-driven speech." ↵Charles Chen2012-08-143-10/+29
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-mr1-dev * commit 'dd7f79097af10aa448ec10128f261cbadf4842ac': Change accessibility event type for app-driven speech.