Satoshi Kataoka
249ad4d57c
am 79376326: am f555b255: am 5d33d2c2: am 9b969b26: am 13498620: am 4bb504ce: am 45728330: am f4352c2c: Merge "Use correct appname resource"
...
* commit '793763268e146546e6e616f336561e4795f5580b':
2013-04-10 19:34:40 -07:00
Baligh Uddin
1d024eca3f
am 307d2aa2: am 8e48a618: am 18e45a93: am f1c2946c: am 4021464c: am 4b66d0c4: am a01fb001: am a3e47f87: am 74089a09: am ba0e497a: Merge commit \'525bbec9eccbf5bd4581c2b9908e46f61c4431ad\' into jb-mr2-dev
...
* commit '307d2aa21885ab6987b29c1a04cbd0eafdb3bfe7':
2013-04-10 19:34:38 -07:00
Satoshi Kataoka
894a8ffcfd
am 9f419592: am c3c1b4db: am 5d9459df: am 67d1bdd4: am ac2d54b5: am 0cc63149: am c1c3e03c: am 140b6705: Merge "Fix appname"
...
* commit '9f419592ff7d5a67cc978814cfa1fe443ab35407':
2013-04-10 19:34:37 -07:00
Tadashi G. Takaoka
680d689d85
am c61393c8: am 56642281: am d7bcc52d: am f510d154: am bb0c999b: am dbb90d08: am bd7b4fcc: am ee91bde1: Clean up InflateException reference from KeyboardBuilder
...
* commit 'c61393c8ef6f6c1fd7e48b9c505fb3300bf992a2':
2013-04-10 19:34:35 -07:00
The Android Open Source Project
5d674b166d
am 55172624: am b2c2ce31: (-s ours) am 7de82b0e: am 6ab186a1: am c4176236: (-s ours) am 210226c5: (-s ours) am 54f0ae27: am a6fae701: (-s ours) am 0849a4b9: (-s ours) Reconcile with jb-mr2-release - do not merge
...
* commit '5517262476b8bb22953f8491fb88dd01c0880a7e':
2013-04-10 19:34:34 -07:00
Alan Viverette
e592be5809
am 046a311a: am d19c71d9: am 3c082157: am 44678fcf: am f1bcc1d7: am 9ecac40d: am 4f11af0c: am 9da7fa0f: am 559616fb: Prevent keyboard A11y proxy from referencing a null keyboard view.
...
* commit '046a311a134a15c5f3d9465e03a4e796def1b6b9':
2013-04-10 19:34:32 -07:00
Jean Chalard
11034c340a
am dee08de2: am 724ff298: (-s ours) am 4ddfde7b: am a050834c: am 11b600b9: (-s ours) am 2f73105a: (-s ours) am db5e07f7: Merge "[DO NOT MERGE] Increase string limits" into jb-mr2-dev
...
* commit 'dee08de2c5bc71fdeb3182a8ddd1a10568ac33ef':
2013-04-10 19:34:31 -07:00
Jean Chalard
9f9050d18f
am 2cb50a05: am 93465ea3: am a747d762: am 6e78878f: am 844e5014: Merge "Increase string limits"
...
* commit '2cb50a05cd1d35a422666b6893a2a77c69c1b700':
2013-04-10 19:34:30 -07:00
Baligh Uddin
0b758ec77f
am e7edb561: am 1368eeee: (-s ours) am 108ee452: am f980ec6c: am fc801fe8: (-s ours) am c57cf2b7: (-s ours) am 841e6016: Import translations. DO NOT MERGE
...
* commit 'e7edb5617447cf00eaedb33f5df87223c81209cf':
2013-04-10 19:34:28 -07:00
Baligh Uddin
3847aa30ae
am 781195f4: am 119eaf7a: (-s ours) am c1283003: am 6e0e8dd6: am 8ca085db: (-s ours) Import translations. DO NOT MERGE
...
* commit '781195f438226e1f556850198c5e51b19523ba63':
2013-04-10 19:34:27 -07:00
Baligh Uddin
5244d6378c
am 41db26ed: am 68889f1c: (-s ours) am 0b227bb9: am 57b68207: Import translations. DO NOT MERGE
...
* commit '41db26ed189bac6ae46b4f5d346839b8ec03cced':
2013-04-10 19:34:26 -07:00
Satoshi Kataoka
82a67bc8bb
am e3c0cca4: am e8a3e964: am 395e500b: am bb9a8e08: am f463b45d: Merge "Fix Possible NPE"
...
* commit 'e3c0cca463f9e85657d99cecdf88d4aa3c5c2ee0':
2013-04-10 19:34:24 -07:00
Satoshi Kataoka
d430c1b6bf
am d6f56350: am 619d1f73: am 0c99a379: am e42522f3: am 2cdf5351: Merge "Fix possible SIOOBE"
...
* commit 'd6f56350fcc63a35506023d555ab66ba3481ad30':
2013-04-10 19:34:23 -07:00
Kurt Partridge
798820ab1d
am 3012c891: am 867b2380: am 35e02ccd: am bf62dc03: am ef103e1f: Merge "Close ResearchLogger upon onFinishInputView"
...
* commit '3012c891ba1ce9282b38ad06b3249b682365e7a5':
2013-04-10 19:34:22 -07:00
The Android Open Source Project
ab6fa04158
am e72a088f: am a6dcb55e: (-s ours) am 62adeccd: am 577f08a3: am 22384b57: (-s ours) am 0ed901ff: (-s ours) Reconcile with jb-mr2-release - do not merge
...
* commit 'e72a088fe2858cbc479259bdf858e8b4cb348690':
2013-04-10 19:34:20 -07:00
The Android Open Source Project
83346295ea
am 2c7b1b82: am d2582473: (-s ours) am 22953740: Reconcile with jb-mr2-release - do not merge
...
* commit '2c7b1b82c58e75594f0da1121622caba3b542377':
2013-04-10 19:34:19 -07:00
Baligh Uddin
d3ae58ef1b
am 3bc22c56: am e7d91194: (-s ours) am 370070ae: am 4cdb7ccb: Import translations. DO NOT MERGE
...
* commit '3bc22c565eb00ba01582ef7dc6d09679b51022de':
2013-04-10 19:34:18 -07:00
Baligh Uddin
3c163ec173
am ac68b5ce: am 4b8494c4: (-s ours) Import translations. DO NOT MERGE
...
* commit 'ac68b5cebf77a9411626a4ce7b77ab06ebe513e0':
Import translations. DO NOT MERGE
2013-04-10 19:34:17 -07:00
Baligh Uddin
8acb56b60b
am 128ab7e5: Import translations. DO NOT MERGE
...
* commit '128ab7e5e36e133169f649232a5193f35f9932ca':
Import translations. DO NOT MERGE
2013-04-10 19:34:14 -07:00
Satoshi Kataoka
a2b129e9ae
am 0b0d9827: am 95fe8267: Move suggest logic to AOSP
...
* commit '0b0d9827a01b50d4bbe01ecfa2d42a27dc5069e9':
Move suggest logic to AOSP
2013-04-10 19:34:13 -07:00
Jean-Baptiste Queru
d9f35e3226
am a21bec13: am 30667266: (-s ours) am 5bcb3876: Merge 2caa1d81ce
- do not merge
...
* commit 'a21bec13357c02f5964e93aaec444f620bf83f60':
2013-04-10 19:34:12 -07:00
Satoshi Kataoka
8b3009ef48
add a debug flag to evaluate the most probable string
...
Change-Id: I34dc08c14feb9cbc0304c1d0ff06922e3b65819d
2013-04-11 11:08:12 +09:00
Tadashi G. Takaoka
a4463d7a9a
More precise geometry checking for more keys keyboard
...
Bug: 8484528
Change-Id: I0dd09530a5262fee9c19bb0f11d5830b00306944
2013-04-11 10:44:54 +09:00
Kurt Partridge
94c441a424
am cdaee868: Merge "Preserve a class for testing"
...
* commit 'cdaee868a3a7b49911ff52aa530076a44dcbb299':
Preserve a class for testing
2013-04-10 16:47:53 -07:00
Kurt Partridge
cdaee868a3
Merge "Preserve a class for testing"
2013-04-10 23:45:33 +00:00
Kurt Partridge
3684036eed
Preserve a class for testing
...
Addresses b/8583091
Change-Id: I89605223784312d9572dfc7c8aaa7e5eba44c4f6
2013-04-10 16:40:17 -07:00
Tom Ouyang
f08c75f20c
am fd9f3d97: Add ability to handle digraphs in gesture and tap typing
...
* commit 'fd9f3d97aee97e9d2e5b9016ec61e120c1265b6a':
Add ability to handle digraphs in gesture and tap typing
2013-04-10 16:03:42 -07:00
Tom Ouyang
38a9e5a5bf
am b6e1777d: Merge "Add mechanism to handle digraphs in DicNode"
...
* commit 'b6e1777d4b78fd425f1960299fd28a685c41aaeb':
Add mechanism to handle digraphs in DicNode
2013-04-10 15:55:22 -07:00
Kurt Partridge
3e1f652c2c
am 099dd3f2: Merge "Better release build reporting"
...
* commit '099dd3f277bcf43326b9e23642edf77a35b5dd94':
Better release build reporting
2013-04-10 15:55:20 -07:00
Tom Ouyang
fd9f3d97ae
Add ability to handle digraphs in gesture and tap typing
...
Example: Gesture the German word "ueber" and the system will now replace
the transliteration "ue" with the correct u-umlaut.
Bug: 8493920
Change-Id: I03e1d6311b4187b6c7f802d8fef43a50eee12721
2013-04-10 22:52:49 +00:00
Tom Ouyang
b6e1777d4b
Merge "Add mechanism to handle digraphs in DicNode"
2013-04-10 22:52:25 +00:00
Kurt Partridge
099dd3f277
Merge "Better release build reporting"
2013-04-10 22:51:21 +00:00
Tom Ouyang
25e8eda9af
Add mechanism to handle digraphs in DicNode
...
This is needed to support for German umlaut handling for both gesture and typing input.
Bug: 8493920
Change-Id: I292e2a4911c54aa5566c38411016a220bb35a1f4
2013-04-10 14:35:49 -07:00
Baligh Uddin
5bbf4f302a
am cc42e139: (-s ours) Import translations. DO NOT MERGE
...
* commit 'cc42e139c3f0cf943a1dd60fb3439409720e3674':
Import translations. DO NOT MERGE
2013-04-10 14:12:54 -07:00
Baligh Uddin
cc42e139c3
Import translations. DO NOT MERGE
...
Change-Id: Icb4c4f32b1549f3d98b99a48b7c2f1b0de1b5a04
Auto-generated-cl: translation import
2013-04-10 13:25:52 -07:00
Baligh Uddin
58df3cfaee
Import translations. DO NOT MERGE
...
Change-Id: Iafc0a5506abef8e709d76ebf4600bacae7dd1e00
Auto-generated-cl: translation import
2013-04-10 13:21:21 -07:00
Baligh Uddin
d86e14aeba
Import translations. DO NOT MERGE
...
Change-Id: I47d7f8fc86fcee4702c43fc6d7bdb946801951e1
Auto-generated-cl: translation import
2013-04-10 13:20:27 -07:00
Kurt Partridge
6108624a00
Better isolate ResearchLogging data
...
Calls to LatinIME#onStartInputViewInternal log important information
about the context in which an IME is used. This is reported as a
single LogStatement. Previously, this was not placed into a separate
LogUnit, and was mixed in with general word data. This change wraps
this LogStatement in its own LogUnit.
Change-Id: I0fecd41c8a1de622a764cc4b5d6902336697046c
2013-04-10 11:53:38 -07:00
Kurt Partridge
dfa5628cd3
Better release build reporting
...
The ResearchLogger reports whether a build is a release build or not
to avoid polluting data with IME debugging work by developers.
Previously this was done by checking a constant flag, which was also
serving the dual purpose of masking out debug code in release builds.
This change introduces a heuristic to determine whether a build was
created by a developer (using the package versionName), and annotating
the data sent to the server appropriately.
Change-Id: Icbad17c66b703cabf6d23d05e2c7c41bcceaae45
2013-04-10 11:52:37 -07:00
Jean Chalard
ca0fdbbe2e
Fix two bugs in dicttool
...
Both bugs only affect debug mode. One has the wrong object tested
with equals, the other has the iteration failing in some cases.
Change-Id: Ie9100d257a3f9e3be340cf3e38116f63417bdc1a
2013-04-10 22:10:31 +09:00
Jean Chalard
cd51b80a0b
am fb3e8057: Merge "Fix a bug where a space would not be inserted before a gesture"
...
* commit 'fb3e805722975c39a47e29cfe6c27dd8a8f30701':
Fix a bug where a space would not be inserted before a gesture
2013-04-10 04:24:19 -07:00
Jean Chalard
fb3e805722
Merge "Fix a bug where a space would not be inserted before a gesture"
2013-04-10 11:19:31 +00:00
Jean Chalard
30b8004b56
Fix a bug where a space would not be inserted before a gesture
...
Bug: 8583675
Change-Id: I14924fef5663f48481994c02c56be45f9f85be65
2013-04-10 20:10:28 +09:00
Tadashi G. Takaoka
9a6ff5dcef
am c7d41589: Merge "Use private object as a lock instead of synchronized method"
...
* commit 'c7d4158979dc729767e8ab541d19feda672ea8da':
Use private object as a lock instead of synchronized method
2013-04-10 03:00:13 -07:00
Tadashi G. Takaoka
c7d4158979
Merge "Use private object as a lock instead of synchronized method"
2013-04-10 09:56:27 +00:00
Tadashi G. Takaoka
1502d97795
am 12e77de2: Merge "Use private lock object instead of synchronized method"
...
* commit '12e77de2128d836a53eb6cd3f96b939f71727241':
Use private lock object instead of synchronized method
2013-04-10 02:38:23 -07:00
Tadashi G. Takaoka
1495049728
am 1e256f58: Merge "Protect simultaneously modifying gesture preview data"
...
* commit '1e256f5888805eff3f1a2db88ea1d60c622689a2':
Protect simultaneously modifying gesture preview data
2013-04-10 02:38:22 -07:00
Tadashi G. Takaoka
12e77de212
Merge "Use private lock object instead of synchronized method"
2013-04-10 09:35:12 +00:00
Tadashi G. Takaoka
1e256f5888
Merge "Protect simultaneously modifying gesture preview data"
2013-04-10 09:34:59 +00:00
Tadashi G. Takaoka
951ea3c06d
Use private object as a lock instead of synchronized method
...
Change-Id: I0b9a935d8c97ddfb18ab7950a9d6bf542863072a
2013-04-10 18:34:01 +09:00