Satoshi Kataoka
01eb9b2528
am 71f828b1: am 9ff33b6d: am d430c1b6: am d6f56350: am 619d1f73: am 0c99a379: am e42522f3: am 2cdf5351: Merge "Fix possible SIOOBE"
...
* commit '71f828b12aa1fca16e8824c5ea44f61ebbc7f7d9':
2013-04-17 19:39:13 -07:00
Kurt Partridge
663660295b
am a6092dc8: am 504bbe38: am 798820ab: am 3012c891: am 867b2380: am 35e02ccd: am bf62dc03: am ef103e1f: Merge "Close ResearchLogger upon onFinishInputView"
...
* commit 'a6092dc8a55d2453a7746c296e3f21d4667b5e94':
2013-04-17 19:39:12 -07:00
The Android Open Source Project
cf0c1a7d6e
am 19289df5: am e279de02: (-s ours) am ab6fa041: 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 '19289df5e40acb355d52c47d6c27fd8e40407058':
2013-04-17 19:39:10 -07:00
The Android Open Source Project
faa9a5ecc7
am d9f9ba39: am 4b176a01: (-s ours) am 83346295: am 2c7b1b82: am d2582473: (-s ours) am 22953740: Reconcile with jb-mr2-release - do not merge
...
* commit 'd9f9ba395fe679d1f89e92ca2a28aa983117d4ea':
2013-04-17 19:39:09 -07:00
Baligh Uddin
bc5075e0da
am 536ec3bf: am b4fbb295: (-s ours) am d3ae58ef: am 3bc22c56: am e7d91194: (-s ours) am 370070ae: am 4cdb7ccb: Import translations. DO NOT MERGE
...
* commit '536ec3bf58d8f30a5c2952b280536079f4311f1d':
2013-04-17 19:39:07 -07:00
Baligh Uddin
4d5ebdf53f
am f420e3bf: am 792abb73: (-s ours) am 3c163ec1: am ac68b5ce: am 4b8494c4: (-s ours) Import translations. DO NOT MERGE
...
* commit 'f420e3bf9a381c48412e7de2f6a99024a54d9d8b':
2013-04-17 19:39:06 -07:00
Baligh Uddin
ea0d7ecd97
am 82c49d74: am c1f3a801: (-s ours) am 8acb56b6: am 128ab7e5: Import translations. DO NOT MERGE
...
* commit '82c49d746d154551492ffec046442fc1021b5a49':
2013-04-17 19:39:04 -07:00
Satoshi Kataoka
b2230d9073
am 62f52e4f: am a514e958: am a2b129e9: am 0b0d9827: am 95fe8267: Move suggest logic to AOSP
...
* commit '62f52e4fcee553b81a8b4e51162beb4fe527049a':
2013-04-17 19:39:03 -07:00
Jean-Baptiste Queru
67953e4da4
am 626dd2a0: am 784eda74: (-s ours) am d9f35e32: am a21bec13: am 30667266: (-s ours) am 5bcb3876: Merge 2caa1d81ce
- do not merge
...
* commit '626dd2a0ab4fff44a8e313101a908e4752aaf8d3':
2013-04-17 19:39:02 -07:00
Kurt Partridge
9cf3937281
am 94c441a4: am cdaee868: Merge "Preserve a class for testing"
...
* commit '94c441a424875f815d7e84d02da5c8943ad6f7a6':
Preserve a class for testing
2013-04-17 19:39:00 -07:00
Tom Ouyang
e9de986d41
am f08c75f2: am fd9f3d97: Add ability to handle digraphs in gesture and tap typing
...
* commit 'f08c75f20cb9766141edf7e9b2715510f6da1fdc':
Add ability to handle digraphs in gesture and tap typing
2013-04-17 19:38:59 -07:00
Tom Ouyang
0ca76c94f5
am 38a9e5a5: am b6e1777d: Merge "Add mechanism to handle digraphs in DicNode"
...
* commit '38a9e5a5bf1a45e87db9a4b03f670cf402321d45':
Add mechanism to handle digraphs in DicNode
2013-04-17 19:38:58 -07:00
Kurt Partridge
6267ec688e
am 3e1f652c: am 099dd3f2: Merge "Better release build reporting"
...
* commit '3e1f652c2c39351d306b3a930340948a46104de0':
Better release build reporting
2013-04-17 19:38:57 -07:00
Baligh Uddin
60ffda411f
am 5bbf4f30: am cc42e139: (-s ours) Import translations. DO NOT MERGE
...
* commit '5bbf4f302a131c58010101722719d97c11c350bc':
Import translations. DO NOT MERGE
2013-04-17 19:38:55 -07:00
Baligh Uddin
855b805312
am d86e14ae: Import translations. DO NOT MERGE
...
* commit 'd86e14aeba44d75651c75d56783f66c294b8f2b7':
Import translations. DO NOT MERGE
2013-04-17 19:38:52 -07:00
Jean Chalard
7503ef330c
am cd51b80a: am fb3e8057: Merge "Fix a bug where a space would not be inserted before a gesture"
...
* commit 'cd51b80a0b31493ef9dce9b5283264399b305ba0':
Fix a bug where a space would not be inserted before a gesture
2013-04-17 19:38:51 -07:00
Tadashi G. Takaoka
c627f64274
am 9a6ff5dc: am c7d41589: Merge "Use private object as a lock instead of synchronized method"
...
* commit '9a6ff5dcef1a593260032b5e10eb801de297c0b2':
Use private object as a lock instead of synchronized method
2013-04-17 19:38:49 -07:00
Tadashi G. Takaoka
4516304436
am 1502d977: am 12e77de2: Merge "Use private lock object instead of synchronized method"
...
* commit '1502d9779555958b0ca147fda1cab1e6302c9035':
Use private lock object instead of synchronized method
2013-04-17 19:38:48 -07:00
Tadashi G. Takaoka
8ea774ebf2
am 14950497: am 1e256f58: Merge "Protect simultaneously modifying gesture preview data"
...
* commit '14950497280f15b6d1de9e6c5d159ce46e27180b':
Protect simultaneously modifying gesture preview data
2013-04-17 19:38:46 -07:00
Jean Chalard
818b7d4686
am 80d7ed0b: am 4f430763: Fix a faulty test
...
* commit '80d7ed0bb8910fc85e5b5e68f287dc381511293f':
Fix a faulty test
2013-04-17 19:38:45 -07:00
Jean Chalard
99e91fc8ec
am 2dd2e2d7: am 99b93d17: Fix a bug where autocorrection status would be wrong.
...
* commit '2dd2e2d7dff8c4446d536bd23fc94a5538c24ddf':
Fix a bug where autocorrection status would be wrong.
2013-04-17 19:38:43 -07:00
Tadashi G. Takaoka
9a0f6ef847
am c35bca68: am 262d5bd9: Don\'t override EXTRA_SHOW_FRAGMENT if exists
...
* commit 'c35bca685689ff6430e7a9393af64c74112bf677':
Don't override EXTRA_SHOW_FRAGMENT if exists
2013-04-17 19:38:41 -07:00
Tadashi G. Takaoka
f0a4508ad5
am f5aa2fd5: am 10af4b6e: Merge "Separate StringUtils.capitalizeFirstCharacter"
...
* commit 'f5aa2fd5c868cae6e879858738a5eef4445aaca8':
Separate StringUtils.capitalizeFirstCharacter
2013-04-17 19:38:40 -07:00
Keisuke Kuroynagi
5c7c36e31f
am e81c1678: am 87fdde6e: Typing double letters via a \'circle\' on the key.
...
* commit 'e81c16788712590fd6cf9e14420d50acf029ad48':
Typing double letters via a 'circle' on the key.
2013-04-17 19:38:38 -07:00
Tadashi G. Takaoka
6f6edd76f8
am ae8a941e: am f606fd85: Hide Setup Wizard icon for stock keyboard
...
* commit 'ae8a941e12e927e6f5b2e42bd48999397fd5fe2a':
Hide Setup Wizard icon for stock keyboard
2013-04-17 19:38:37 -07:00
Tadashi G. Takaoka
0d9164ecd8
am 0d7499bc: am 4fdfce6d: Merge "Refactor SpellCheckerProximityInfo as extending ProximityInfo"
...
* commit '0d7499bccfb37bad2364202657a4feebab137aeb':
Refactor SpellCheckerProximityInfo as extending ProximityInfo
2013-04-17 19:38:35 -07:00
Tom Ouyang
6a0f11cc91
am ff981cc3: am 43779c04: Merge "Add method to get dictionary flags from DicTraverseSession"
...
* commit 'ff981cc3e3169ca0b9af9bf40cd55cd9f95fa63e':
Add method to get dictionary flags from DicTraverseSession
2013-04-17 19:38:34 -07:00
Baligh Uddin
1646267fdf
am 8e7ca6be: am 224e969e: (-s ours) Merge "Import translations. DO NOT MERGE"
...
* commit '8e7ca6be7ee0b4bbad536b8434b4e5826b8c9ecf':
Import translations. DO NOT MERGE
2013-04-17 19:38:32 -07:00
Baligh Uddin
2eede9f46d
am 13811400: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
...
* commit '138114008e591af2ffa1169b7d64ff46b0781500':
Import translations. DO NOT MERGE
2013-04-17 19:38:32 -07:00
Kurt Partridge
d34979381d
am ab8f166e: am 09ab6495: Merge "[FileEncap18] Clean up uploading scheduling"
...
* commit 'ab8f166e6793e214dcb92454b10dbe5cc74daf9b':
[FileEncap18] Clean up uploading scheduling
2013-04-17 19:33:02 -07:00
Baligh Uddin
5eb28c1928
am a130057b: Import translations. DO NOT MERGE
...
* commit 'a130057bcf1b3daa8c8823743b1190f460bbdc45':
Import translations. DO NOT MERGE
2013-04-15 14:27:38 -07:00
Baligh Uddin
a130057bcf
Import translations. DO NOT MERGE
...
Change-Id: I5f6f7233c46f7a5faaac5f959c93329ace4c70f4
Auto-generated-cl: translation import
2013-04-15 13:38:18 -07:00
Tadashi G. Takaoka
18414333d4
am e2af9b7e: Merge "Reset vertical correction when more suggestions are in modal mode"
...
* commit 'e2af9b7eb519126e67fb054e8bd5064049958feb':
Reset vertical correction when more suggestions are in modal mode
2013-04-14 22:00:05 -07:00
Tadashi G. Takaoka
e2af9b7eb5
Merge "Reset vertical correction when more suggestions are in modal mode"
2013-04-15 04:57:33 +00:00
Tadashi G. Takaoka
51c38a441a
Reset vertical correction when more suggestions are in modal mode
...
Bug: 8605150
Change-Id: Iadbebfb80e765c97e58e8524eb87419f2a9e41d4
2013-04-15 13:56:03 +09:00
Jean Chalard
6223d82312
am c2653d0b: Fix a typo
...
* commit 'c2653d0b5c42290d8e7331617f0207c5a7537f67':
Fix a typo
2013-04-14 21:01:25 -07:00
Jean Chalard
c2653d0b5c
Fix a typo
...
Change-Id: I27b925be030e9e6ee8ae49dc13f39accec996d7e
2013-04-15 12:57:27 +09:00
Jean Chalard
69ffa8b0ff
am 03d1dff3: Merge "Fix Binary dict tests"
...
* commit '03d1dff38d4de0f043420aae8a292d74b531324a':
Fix Binary dict tests
2013-04-14 20:56:11 -07:00
Jean Chalard
03d1dff38d
Merge "Fix Binary dict tests"
2013-04-15 03:53:54 +00:00
Jean Chalard
c2e9c511cb
Fix Binary dict tests
...
There are two problems here. The first one is the tests would send
an invalid unicode character. Although we could want dicttool to
handle this more gracefully, it's fine for now.
The second problem is much more serious. If a node has more than
128 children, then the java code will crash trying to read the
dictionary back because of a bug that this change fixes. In
theory, it's possible that happens when we try to load the user
history dictionary back from the disk - native code is not affected
so there is no other point that may cause a problem.
In the practice, that means you'd need to have 129 words with a
common prefix (including empty string) but all different after
this. It's almost impossible with Google Keyboard since there are
only so many keys on the keyboard that you can make a word out
of, and then again you'd have to do it repeatedly until it
actually enters the user history dictionary, wait for it to get
saved on the disk.
The bad news is, if you manage to get this far, the keyboard will
crash every time and won't be able to get up until you clear
data for the package.
The good news is, the dictionary itself is not corrupted and only
the reading code is wrong. So updating to a newer version would
actually even recover from this situation.
All in all, considering how almost-impossible this is to trigger,
I don't think even a single user actually did hit this bug.
Bug: 8583091
Change-Id: Iabb2a7f47cbd9ed3193d2a3487318d280753e071
2013-04-15 12:48:16 +09:00
Satoshi Kataoka
6246b7c324
am a94bb198: fix assertion
...
* commit 'a94bb198cf13a3729bb992fc9c5bfce779e58469':
fix assertion
2013-04-14 20:12:46 -07:00
Satoshi Kataoka
a94bb198cf
fix assertion
...
Change-Id: I34ff470122aa0f34c66425d2eeae7590187d3074
2013-04-15 12:03:21 +09:00
Tadashi G. Takaoka
be1232b36f
am b12c2af3: Tighten unit test condition of MoreKeysKeyboardBuilder
...
* commit 'b12c2af32e09624e1298e0109441b0f4d74b74dd':
Tighten unit test condition of MoreKeysKeyboardBuilder
2013-04-14 18:17:25 -07:00
Tadashi G. Takaoka
b12c2af32e
Tighten unit test condition of MoreKeysKeyboardBuilder
...
Bug: 8601979
Change-Id: Icf584f3b35adce69cc3dfc46f3aacfef05e5dd2a
2013-04-15 09:58:18 +09:00
Baligh Uddin
a270f90a32
am dc64866c: (-s ours) am 0dbc8c35: am f2ab0adc: Import translations. DO NOT MERGE
...
* commit 'dc64866c70f19e1f3613f8ee19f1a602961e0d9d':
Import translations. DO NOT MERGE
2013-04-12 17:05:25 -07:00
Baligh Uddin
dc64866c70
am 0dbc8c35: am f2ab0adc: Import translations. DO NOT MERGE
...
* commit '0dbc8c3509dc71bfd8ac831b89fe229b9c74f6a7':
Import translations. DO NOT MERGE
2013-04-12 17:03:07 -07:00
Baligh Uddin
a5506b53f1
am bfedad23: (-s ours) Merge "Import translations. DO NOT MERGE"
...
* commit 'bfedad238f52b873599d68718307c4a8ee98e9eb':
Import translations. DO NOT MERGE
2013-04-12 17:00:11 -07:00
Baligh Uddin
0dbc8c3509
am f2ab0adc: Import translations. DO NOT MERGE
...
* commit 'f2ab0adc5e3bd8f436aafcea1b396e288c69f7d4':
Import translations. DO NOT MERGE
2013-04-12 16:59:36 -07:00
Baligh Uddin
bfedad238f
Merge "Import translations. DO NOT MERGE"
2013-04-12 23:56:49 +00:00
Baligh Uddin
a559e767d1
Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
2013-04-12 23:56:08 +00:00