Tadashi G. Takaoka
617362fdb9
am 1b7451af
: am 57a7a5c3
: am 76c00dec
: am 7580e994
: am 48d8d8d0
: Fix potential NPE in MainKeyboardView.KeyTimerHandler
...
* commit '1b7451af76939636548bf1fd290b081158888229':
2013-04-10 19:35:05 -07:00
Jean Chalard
84b246f147
am db993a5f
: am ae97a93a
: am 86b8b7b4
: am 9bf1dfeb
: am 2188cbae
: Merge "Fix an NPE"
...
* commit 'db993a5fe4b7e18f79c55875fa8f5caae94a2ba2':
2013-04-10 19:35:04 -07:00
Jean Chalard
5c874a7b58
am bb94c643
: am 5b248590
: am 1c63efc9
: am a657afc3
: am d555a0d7
: Merge "Cleanup"
...
* commit 'bb94c6430baa9a130f1cb85881df04d859dc43a0':
2013-04-10 19:35:03 -07:00
Baligh Uddin
8ed884e70f
am ca8ea431
: am a3ed3254
: am 05b7988a
: am 53698f8d
: am fd0e40ef
: am 78b07d8b
: am 0cd02c2b
: keep history after reset to jb-ub-latinimegoogle-azuki
...
* commit 'ca8ea431970cded212845e2644f0509e12054aaf':
2013-04-10 19:35:01 -07:00
Baligh Uddin
f939332ca9
am 94065faf
: am c6660830
: (-s ours) am 68a0afc3
: am 0c777365
: am fbb6500d
: (-s ours) am 5bcbc21a
: (-s ours) am c08b8245
: (-s ours) Import translations. DO NOT MERGE
...
* commit '94065faf7d75c032c2670860f0a93b772d83b948':
2013-04-10 19:35:00 -07:00
The Android Automerger
c82a56b427
am ccc3c232
: am 228e26f7
: am ea46fdcb
: am 65dfe94d
: am 1237c872
: am a02de1f7
: am 5c3d51e2
: merge in jb-ub-latinimegoogle-azuki history after reset to jb-ub-latinimegoogle
...
* commit 'ccc3c23238801c2d8755a47546eb0695009b4a3c':
2013-04-10 19:34:59 -07:00
Tadashi G. Takaoka
faadc0a7cf
am b5843222
: am 62b07bf9
: am 561a04f3
: am 1911c513
: am abd22393
: am 8b120b98
: am 50cc14b5
: am ef86bbce
: Add const_cast to live with host\'s jni.h
...
* commit 'b58432221c84cdc8bb75ea33325c87aa78ae5349':
2013-04-10 19:34:57 -07:00
Tadashi G. Takaoka
fc369029ab
am 9c59fb54
: am fc0fc521
: am e01d1960
: am c17e0bba
: am 830a8cbb
: am 33fa6a0b
: am cc75c950
: am 73d00e68
: Merge "Use XmlPullParser.getEventType()"
...
* commit '9c59fb54e5d627e9caeeff9f1b02fef08e4fddb7':
2013-04-10 19:34:56 -07:00
Satoshi Kataoka
a1cd79708f
am 71f1b270
: am 8138c8d2
: am f4f4d6c9
: am b3438173
: am d3c823c1
: am dd8ca1f8
: am bc586fb1
: am 0b327101
: Merge "Fix possible NPE"
...
* commit '71f1b270976d87290598ec5e5da7ebfaab907a41':
2013-04-10 19:34:55 -07:00
Tadashi G. Takaoka
098ecd550d
am 5283b90a
: am 60083e3e
: am 49d59d4a
: am a469cdfe
: am d0495a35
: am 56b1bd86
: am f892f775
: am d17b69ec
: Clean up XmlParserUtils
...
* commit '5283b90ae353e1ceb466d8fdbbc748f8147ef3d0':
2013-04-10 19:34:54 -07:00
Baligh Uddin
88db133158
am 6626fb25
: am 51c7dbea
: (-s ours) am 4379dbea
: am 324b1880
: am f0213d1a
: (-s ours) am c1cb4766
: (-s ours) am 6537280f
: am 5f976d1c
: (-s ours) am ff41125b
: (-s ours) am fba54597
: Import translations. DO NOT MERGE
...
* commit '6626fb255b68092820191697035e7aa1f048c461':
2013-04-10 19:34:52 -07:00
Baligh Uddin
f81c91326a
am 1e8d1f41
: am d72347f9
: (-s ours) am 67f7bb2e
: am 284d4285
: am f0346d70
: (-s ours) am fc135df5
: (-s ours) am 24daa2a1
: am 6616188e
: (-s ours) Import translations. DO NOT MERGE
...
* commit '1e8d1f418f48f3b350491bcce55f629493e3be9e':
2013-04-10 19:34:51 -07:00
Baligh Uddin
a332825529
am 38f2bbb3
: am 210d473d
: (-s ours) am a62edb47
: am 3d082f1b
: am 14ef11a8
: (-s ours) am 93c5c7a4
: (-s ours) am 2898aac8
: Import translations. DO NOT MERGE
...
* commit '38f2bbb3926c6d65a2470f36bbf5aef592f68bec':
2013-04-10 19:34:50 -07:00
Tadashi G. Takaoka
70252ecff7
am 5eb7a00e
: am 1047bf17
: am 32d89afa
: am e2ccd61b
: am 2b04e787
: am 71fb8af7
: am ec183b50
: am fb658d6c
: Fix possible ArrayIndexOutOfBoundsException
...
* commit '5eb7a00e4e7bb810f5b43e3cbb16c34854e7c0b1':
2013-04-10 19:34:49 -07:00
Baligh Uddin
1cf0e85d25
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 translations. DO NOT MERGE
...
* commit '97687031478b41c7279b85b483ff6bf6a5d28a9e':
2013-04-10 19:34:47 -07:00
Baligh Uddin
755db5bd3e
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 '3a97d388163353c098b970eb5aee235cfe2ab483':
2013-04-10 19:34:46 -07:00
Baligh Uddin
c46a975ce1
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-latinimegoogle
...
* commit '9f291d17c688d1a0150d91f1c694b539c5d4df67':
2013-04-10 19:34:45 -07:00
Alan Viverette
45b1a302cf
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 '80a2e25162a9a5ab7ae05e986e41a11c6774a67a':
2013-04-10 19:34:44 -07:00
Satoshi Kataoka
119e697984
am 745725e1
: am 103b1118
: am 33c91be3
: am 40be0244
: am 54b85827
: am 189c1b0e
: am 97ddbf22
: am 19a70087
: Merge "Fix appname"
...
* commit '745725e14437edd29ad266454bc6120c3a23b63c':
2013-04-10 19:34:43 -07:00
Tadashi G. Takaoka
7dcc22b66b
am 5f81bb8c
: am 3ef47fd3
: am e0aa9383
: am a7353dda
: am 5a4700a0
: am 0992fd24
: am 1e3c73de
: am 3a8a63c3
: Remove unused import
...
* commit '5f81bb8cd8b61da91fb6091e9261deeba2e4fbb8':
2013-04-10 19:34:42 -07:00
Tadashi G. Takaoka
863d83ea27
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 '02a59e551ab12327acc58207be54315356722440':
2013-04-10 19:34:41 -07:00
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
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
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