Ken Wakasa
64eda4f4fa
Merge "Fix an infinite loop" into jb-mr2-dev
2013-04-18 16:24:01 +00:00
Jean Chalard
77e26e1c29
Fix an infinite loop
...
What do you mean "Can't happen"?
It happens all the time - the empty string is the default ID, and it
needs to be updated like everyone else.
Bug: 8651858
Change-Id: I5a2f2ebb5b2ef08b27f26be8fb2c3d2f231ebcfc
2013-04-18 23:14:13 +09:00
Jean Chalard
d91268ad9f
Initialize dictionaries at onStartInputView
...
Bug: 8344402
Change-Id: I41b8440f0d72a66fde3f6feb0db8239c9bb10ea3
2013-04-18 14:48:42 +09:00
Baligh Uddin
aa52681bfc
am 627db009: am ac58dcf1: am f3b10815: am 0849b210: (-s ours) am 1cf0e85d: am 97687031: am 0ad31c8d: (-s ours) am a5bc58ac: am 5301db94: am e67698be: (-s ours) am 8051fd0d: (-s ours) am 2a01fc22: am 1e5add78: (-s ours) am 7668deec: (-s ours) am 21160c4e: Import transl
...
* commit '627db0092e0fdcab8b2d4bab9caa0477611e403e':
2013-04-17 19:50:09 -07:00
Baligh Uddin
719f8865fd
am 2b19100a: (-s ours) am 58a4a153: am a9a84c95: am 3d8f50ea: (-s ours) am 755db5bd: am 3a97d388: am 273a21ca: (-s ours) am 772dfa51: am ae8b69fd: am 7ea45c07: (-s ours) am 7f859d68: (-s ours) am 8636ba03: am afe343c1: (-s ours) Merge "Import translations. DO NOT MERGE"
...
* commit '2b19100ad6748aea1f4f9de768f2e45203738c44':
2013-04-17 19:50:07 -07:00
Baligh Uddin
dff9a64655
am 87ad4a8c: (-s ours) am b74cc3f9: am 1a24764e: am 03fbe97c: (-s ours) am c46a975c: am 9f291d17: am 2f8e381b: (-s ours) am 92adcda6: am 42c255c2: (-s ours) am 599290d5: (-s ours) am b4039d96: (-s ours) am 5709e859: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub
...
* commit '87ad4a8c5f40492234c5a80f9c3b22af96e10aa5':
2013-04-17 19:50:06 -07:00
Alan Viverette
c795a288b3
am 69ef660f: am 3de1ae1a: am 849c7858: am eff2ee76: am 45b1a302: am 80a2e251: am 14f65cff: am 8e5fa88a: am f518e71a: am c5ec7545: am 8f807582: am e47ee181: am a7b4398c: Don\'t announce changes for A11y within the same keyboard mode.
...
* commit '69ef660fe717a74b507d76e0f54d381bc66140d6':
2013-04-17 19:50:04 -07:00
Satoshi Kataoka
d1935d0548
am d0642a34: am 775ef9bc: am cb132ce1: am 81295fd2: am 119e6979: am 745725e1: am 103b1118: am 33c91be3: am 40be0244: am 54b85827: am 189c1b0e: am 97ddbf22: am 19a70087: Merge "Fix appname"
...
* commit 'd0642a340f4791bf4e5e6ce295040b9233092393':
2013-04-17 19:50:03 -07:00
Tadashi G. Takaoka
37232a10d2
am 58db8c60: am c0d71c3b: am 3a2e78f9: am 30d9817b: am 7dcc22b6: am 5f81bb8c: am 3ef47fd3: am e0aa9383: am a7353dda: am 5a4700a0: am 0992fd24: am 1e3c73de: am 3a8a63c3: Remove unused import
...
* commit '58db8c60a3f3e6c49f41c1f1af3c0f1692f10bd1':
2013-04-17 19:50:01 -07:00
Tadashi G. Takaoka
c1e417dd2b
am e010bb8a: am 18be37b0: am 96d53923: am 104923e4: am 863d83ea: am 02a59e55: am 1f722ca9: am 4e627c21: am 56796cd7: am 4841df87: am bb679a22: am 3d0fee4e: am c6452f25: Merge "Remove reference to string.english_ime_name"
...
* commit 'e010bb8ad53dee9ce06a4b198657041774a5f278':
2013-04-17 19:49:59 -07:00
Satoshi Kataoka
4bb35fea2d
am 8e8ea448: am 9e78d2ba: am 54f46879: am 1af04dc6: am 249ad4d5: am 79376326: am f555b255: am 5d33d2c2: am 9b969b26: am 13498620: am 4bb504ce: am 45728330: am f4352c2c: Merge "Use correct appname resource"
...
* commit '8e8ea44848c917d6c6806113c45460c0d2ddd849':
2013-04-17 19:49:57 -07:00
Baligh Uddin
daad9c687e
am 5bc76be0: am 15a357a3: am 2060aa13: am 97046d19: am 1d024eca: 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 '5bc76be0a788b271007ef6fb00f02d22034bf9cd':
2013-04-17 19:49:55 -07:00
Satoshi Kataoka
204243c3e1
am 071c3c6d: am e8374789: am 9e45f9e8: am 24cf39e7: am 894a8ffc: am 9f419592: am c3c1b4db: am 5d9459df: am 67d1bdd4: am ac2d54b5: am 0cc63149: am c1c3e03c: am 140b6705: Merge "Fix appname"
...
* commit '071c3c6d0f9d9a234f5b2e84162037a871f59076':
2013-04-17 19:49:54 -07:00
Tadashi G. Takaoka
eeb0459e68
am a446f8f7: am fd06763b: am 7bc7bd79: am 59b23bcf: am 680d689d: am c61393c8: am 56642281: am d7bcc52d: am f510d154: am bb0c999b: am dbb90d08: am bd7b4fcc: am ee91bde1: Clean up InflateException reference from KeyboardBuilder
...
* commit 'a446f8f7b71f5c77b3264a9f4d0deb92bcd3220f':
2013-04-17 19:49:49 -07:00
The Android Open Source Project
41b61150d0
am adef73a7: am eb2fee1d: am 7db5bfa0: am 20995333: (-s ours) am 5d674b16: 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-rele
...
* commit 'adef73a7f8e47e128cfc0598724513afd906788a':
2013-04-17 19:49:47 -07:00
Alan Viverette
3694cc826a
am e4f98a02: am 79ef0a17: am 4b45830a: am 7c9b7f24: am e592be58: 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 'e4f98a02abc09a865e2e7fef681e151407029f52':
2013-04-17 19:49:45 -07:00
Jean Chalard
c825c55779
am b2af86cf: (-s ours) am c5424013: am 186cf922: am 288deb7a: (-s ours) am 11034c34: 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 'b2af86cf0af6ca95378c616c857b7cab1de15dfc':
2013-04-17 19:49:43 -07:00
Jean Chalard
3043965165
am a4156a8e: am 5a59a986: am 2cef4323: am db3713a1: am 9f9050d1: am 2cb50a05: am 93465ea3: am a747d762: am 6e78878f: am 844e5014: Merge "Increase string limits"
...
* commit 'a4156a8e55ad1ae7291ce021061b8f4f3fbedb38':
2013-04-17 19:49:41 -07:00
Baligh Uddin
79971a1f25
am 8a0205e2: (-s ours) am 2d607977: am e04cee4f: am 49201626: (-s ours) am 0b758ec7: 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 '8a0205e249b4106cd38cf8c288d2f33c106cdb52':
2013-04-17 19:49:40 -07:00
Baligh Uddin
ea1510321d
am 4d085cfa: (-s ours) am ffb269b1: am 3df28d14: am 14d778b2: (-s ours) am 3847aa30: am 781195f4: am 119eaf7a: (-s ours) am c1283003: am 6e0e8dd6: am 8ca085db: (-s ours) Import translations. DO NOT MERGE
...
* commit '4d085cfa9b9704928fca945daef534dd25843234':
2013-04-17 19:49:38 -07:00
Baligh Uddin
e0789c736b
am 9ef4b7dd: (-s ours) am bc1bc4d0: am 719e5729: am e71516b2: (-s ours) am 5244d637: am 41db26ed: am 68889f1c: (-s ours) am 0b227bb9: am 57b68207: Import translations. DO NOT MERGE
...
* commit '9ef4b7ddf8302a4ff81d74dc9584c524bdf57971':
2013-04-17 19:49:37 -07:00
Satoshi Kataoka
dcfff5c0d2
am 4109952b: am 7a4430ac: am 5db28826: am b3796ab2: am 82a67bc8: am e3c0cca4: am e8a3e964: am 395e500b: am bb9a8e08: am f463b45d: Merge "Fix Possible NPE"
...
* commit '4109952ba8aaad8454d399094b9b588e28013316':
2013-04-17 19:49:35 -07:00
Satoshi Kataoka
3d82dbcaae
am d3022faf: am 01eb9b25: am 71f828b1: am 9ff33b6d: am d430c1b6: am d6f56350: am 619d1f73: am 0c99a379: am e42522f3: am 2cdf5351: Merge "Fix possible SIOOBE"
...
* commit 'd3022faf0c14f3d0338b38011fd9f6e75fd4e533':
2013-04-17 19:49:33 -07:00
Kurt Partridge
023bee608b
am abf64529: am 66366029: am a6092dc8: am 504bbe38: am 798820ab: am 3012c891: am 867b2380: am 35e02ccd: am bf62dc03: am ef103e1f: Merge "Close ResearchLogger upon onFinishInputView"
...
* commit 'abf645295569f6529c6eb0e9250cc2b69abcbb2d':
2013-04-17 19:49:31 -07:00
The Android Open Source Project
b241b243c8
am 740243cb: (-s ours) am cf0c1a7d: 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 '740243cb69e39efee5f70eedb03ee3ce17529d18':
2013-04-17 19:49:27 -07:00
The Android Open Source Project
3675b5bb96
am 1996320a: (-s ours) am faa9a5ec: 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 '1996320a72581fbb91c0b8bc5ad187fe4f86379c':
2013-04-17 19:49:25 -07:00
Baligh Uddin
480ebe7969
am 403354ba: (-s ours) am bc5075e0: am 536ec3bf: am b4fbb295: (-s ours) am d3ae58ef: am 3bc22c56: am e7d91194: (-s ours) am 370070ae: am 4cdb7ccb: Import translations. DO NOT MERGE
...
* commit '403354bae96595cb51676a77d8737ea468dba9a1':
2013-04-17 19:49:23 -07:00
Baligh Uddin
7c9a29d578
am 2c71e826: (-s ours) am 4d5ebdf5: am f420e3bf: am 792abb73: (-s ours) am 3c163ec1: am ac68b5ce: am 4b8494c4: (-s ours) Import translations. DO NOT MERGE
...
* commit '2c71e8266e2f7b754bae433f69327d0baac0e6c0':
2013-04-17 19:49:22 -07:00
Baligh Uddin
dd3aa37321
am 9f2573e4: (-s ours) am ea0d7ecd: am 82c49d74: am c1f3a801: (-s ours) am 8acb56b6: am 128ab7e5: Import translations. DO NOT MERGE
...
* commit '9f2573e465e7c22c3a1fe36e5b7da7068daf2da6':
2013-04-17 19:49:20 -07:00
Satoshi Kataoka
24c86a666d
am 4c767c81: am b2230d90: am 62f52e4f: am a514e958: am a2b129e9: am 0b0d9827: am 95fe8267: Move suggest logic to AOSP
...
* commit '4c767c8169e03c0d10ac69355af9908384771553':
2013-04-17 19:49:19 -07:00
Jean-Baptiste Queru
68dcdeed72
am 6e5857cb: (-s ours) am 67953e4d: am 626dd2a0: am 784eda74: (-s ours) am d9f35e32: am a21bec13: am 30667266: (-s ours) am 5bcb3876: Merge 2caa1d81ce - do not merge
...
* commit '6e5857cba258f0aa993f3e043b44f061ac447508':
2013-04-17 19:49:17 -07:00
Kurt Partridge
fb4da9692b
am 89ccc962: am 9cf39372: am 94c441a4: am cdaee868: Merge "Preserve a class for testing"
...
* commit '89ccc962e507d574f0603391b9bc994309632b19':
2013-04-17 19:49:15 -07:00
Tom Ouyang
bcefab0cb9
am 44eabffc: am e9de986d: am f08c75f2: am fd9f3d97: Add ability to handle digraphs in gesture and tap typing
...
* commit '44eabffc26c379688138817e6e000b418374257e':
2013-04-17 19:49:14 -07:00
Tom Ouyang
0fe18452df
am 0de0fa3b: am 0ca76c94: am 38a9e5a5: am b6e1777d: Merge "Add mechanism to handle digraphs in DicNode"
...
* commit '0de0fa3baf4014e54340e5539e8b6b62d12bd1e2':
2013-04-17 19:49:12 -07:00
Kurt Partridge
d40d2f3536
am eba670d0: am 6267ec68: am 3e1f652c: am 099dd3f2: Merge "Better release build reporting"
...
* commit 'eba670d07396ecc131b4d827c1f91d1935dd5c7c':
2013-04-17 19:49:11 -07:00
Baligh Uddin
265eed2bca
am 7c0257ae: (-s ours) am 60ffda41: am 5bbf4f30: am cc42e139: (-s ours) Import translations. DO NOT MERGE
...
* commit '7c0257aef54be4147b9d1db9c04a23cd1f3648fa':
2013-04-17 19:49:09 -07:00
Baligh Uddin
93e873cf71
am b155cedc: (-s ours) am 855b8053: am d86e14ae: Import translations. DO NOT MERGE
...
* commit 'b155cedc5815e0d67a95304feb12b658306fe406':
2013-04-17 19:49:07 -07:00
Jean Chalard
56e03dd351
am 9129c0d1: am 7503ef33: am cd51b80a: am fb3e8057: Merge "Fix a bug where a space would not be inserted before a gesture"
...
* commit '9129c0d1f655eee970199b1476557d26ca01ccee':
2013-04-17 19:49:06 -07:00
Tadashi G. Takaoka
7d4f0961d4
am ef2d1555: am c627f642: am 9a6ff5dc: am c7d41589: Merge "Use private object as a lock instead of synchronized method"
...
* commit 'ef2d15553babb9236dc53373c8750281a65ab46f':
2013-04-17 19:49:04 -07:00
Tadashi G. Takaoka
38af721f10
am 44905316: am 45163044: am 1502d977: am 12e77de2: Merge "Use private lock object instead of synchronized method"
...
* commit '44905316760e68a12aa867d08103e37f93fd6215':
2013-04-17 19:49:02 -07:00
Tadashi G. Takaoka
45a1fbd488
am 70a79ee6: am 8ea774eb: am 14950497: am 1e256f58: Merge "Protect simultaneously modifying gesture preview data"
...
* commit '70a79ee60dab73a84c6fa763c6027d985472c49b':
2013-04-17 19:49:00 -07:00
Jean Chalard
1792b8925f
am f514024a: am 818b7d46: am 80d7ed0b: am 4f430763: Fix a faulty test
...
* commit 'f514024aaf5e97b47c9062016261e113cddf611f':
2013-04-17 19:48:57 -07:00
Jean Chalard
0cfbc7c67c
am 8e7e9df1: am 99e91fc8: am 2dd2e2d7: am 99b93d17: Fix a bug where autocorrection status would be wrong.
...
* commit '8e7e9df145a52fe3b12d2699163933dbef70b1ce':
2013-04-17 19:48:56 -07:00
Tadashi G. Takaoka
b3f31ea66a
am 21dd8537: am 9a0f6ef8: am c35bca68: am 262d5bd9: Don\'t override EXTRA_SHOW_FRAGMENT if exists
...
* commit '21dd8537dba215acd4a639d2ca0d69b79214642f':
2013-04-17 19:48:54 -07:00
Tadashi G. Takaoka
367fe0c313
am f8a1317f: am f0a4508a: am f5aa2fd5: am 10af4b6e: Merge "Separate StringUtils.capitalizeFirstCharacter"
...
* commit 'f8a1317f4d517b1fb294a1a8b7c401df4196d62c':
2013-04-17 19:48:53 -07:00
Keisuke Kuroynagi
e399734095
am cde21724: am 5c7c36e3: am e81c1678: am 87fdde6e: Typing double letters via a \'circle\' on the key.
...
* commit 'cde2172412beeacd48650f004139b60eabd4d095':
2013-04-17 19:48:51 -07:00
Tadashi G. Takaoka
eea5453c45
am 86726e21: am 6f6edd76: am ae8a941e: am f606fd85: Hide Setup Wizard icon for stock keyboard
...
* commit '86726e2197f805078f2e5fb4270930ec8eb59f90':
2013-04-17 19:48:49 -07:00
Tadashi G. Takaoka
336bfb2f69
am a51ddebb: am 0d9164ec: am 0d7499bc: am 4fdfce6d: Merge "Refactor SpellCheckerProximityInfo as extending ProximityInfo"
...
* commit 'a51ddebb7c398e31b02d3e8663a82953ecfb0ab5':
2013-04-17 19:48:48 -07:00
Tom Ouyang
1711cee049
am 20d54cab: am 6a0f11cc: am ff981cc3: am 43779c04: Merge "Add method to get dictionary flags from DicTraverseSession"
...
* commit '20d54cab2a6971739d6f3c37f0afacced1d280f8':
2013-04-17 19:48:46 -07:00
Baligh Uddin
f96989dd63
am fe4c83c6: (-s ours) am 1646267f: am 8e7ca6be: am 224e969e: (-s ours) Merge "Import translations. DO NOT MERGE"
...
* commit 'fe4c83c6bf88ee9c2659b57cee9e9ff7579b714c':
2013-04-17 19:48:44 -07:00
