Baligh Uddin
|
6dcfbae439
|
am 4827a249 : am c363302e : Merge commit \'3ac40c6a\' into jb-mr2-dev-plus-aosp
* commit '4827a249060c498531ef0e427e0bd5be9935597a':
|
2013-05-15 12:26:40 -07:00 |
|
Baligh Uddin
|
4827a24906
|
am c363302e : Merge commit \'3ac40c6a\' into jb-mr2-dev-plus-aosp
* commit 'c363302eb7ee43c8ab025a799b84b85c2069b2f7':
|
2013-05-15 12:24:42 -07:00 |
|
Tadashi G. Takaoka
|
6600b06caa
|
am cd196fd5 : am 307f49b8 : Mark some unit tests as @MediumTest
* commit 'cd196fd5e914641ed4eafb11b2975371d85cf669':
Mark some unit tests as @MediumTest
|
2013-05-15 12:24:03 -07:00 |
|
Satoshi Kataoka
|
77c6d2bb77
|
am 25a713d6 : am 11b9f680 : (-s ours) am e5daf660 : (-s ours) am 6845427e : DO NOT MERGE: Return possible suggestions in Google Spell Checker
* commit '25a713d62c84c8728a82a2b211f24d718234d890':
|
2013-05-15 12:24:01 -07:00 |
|
Jean Chalard
|
e229cd9743
|
am d8e55277 : am 83757d43 : Merge "Pass blockOffensiveWords as a parameter"
* commit 'd8e5527701ffe1d9da2280bf7bcca7834387b1c6':
Pass blockOffensiveWords as a parameter
|
2013-05-15 12:24:00 -07:00 |
|
Ken Wakasa
|
f415cc6ba8
|
am 56550ee5 : am 1490b534 : Cleanup -- follow up to Ief04a4abb6dc1f79660a2e419c9c5e271802b5a1
* commit '56550ee5c36cf4a52459ca2bad499403e34c4a7e':
Cleanup -- follow up to Ief04a4abb6dc1f79660a2e419c9c5e271802b5a1
|
2013-05-15 12:23:58 -07:00 |
|
Satoshi Kataoka
|
8781e3b61a
|
am 483fc6f1 : am c43417fb : Fix build
* commit '483fc6f1ff0788e0183a6d221705dcf481523bf5':
Fix build
|
2013-05-15 12:23:57 -07:00 |
|
Jean Chalard
|
6b93b185ef
|
am 3eee5cd2 : am 53b37dc0 : Merge "Fix a layout problem for pre-MR2"
* commit '3eee5cd24b259109b9b2122026a494a050a540e9':
Fix a layout problem for pre-MR2
|
2013-05-15 12:23:55 -07:00 |
|
Baligh Uddin
|
c363302eb7
|
Merge commit '3ac40c6a' into jb-mr2-dev-plus-aosp
Conflicts:
java/src/com/android/inputmethod/latin/spellcheck/AndroidSpellCheckerService.java
Conflict resolved by matching code with jb-mr2-dev.
|
2013-05-15 11:40:41 -07:00 |
|
Tadashi G. Takaoka
|
fe4cdd1219
|
am 8923d767 : am 1e08d3d2 : am 6191026c : am 0caf3f6a : Merge "Introduce MoreSuggestionsListener class"
* commit '8923d7679ed5f765e553c276919a25d44bd2c53b':
|
2013-05-15 11:29:21 -07:00 |
|
Satoshi Kataoka
|
07806b03c5
|
am 1749dba1 : am d53fb22a : am fcfa2cb2 : am 6314b845 : Merge "Add permissions for personalization"
* commit '1749dba188561ade22ccd51a16b861962bfa2673':
|
2013-05-15 11:29:20 -07:00 |
|
Tadashi G. Takaoka
|
95fed88778
|
am 35952d7b : am 2f6851d9 : am f405dc87 : am 17a35383 : Merge "Override View.drawableStateChanged to detect state_pressed"
* commit '35952d7b7497089768b9a5177564a2cf6f57b7d7':
|
2013-05-15 11:29:19 -07:00 |
|
Satoshi Kataoka
|
143e628c1e
|
am 7f63d12e : am 6cf492e4 : am 941b288c : am df2eae6e : Fix exact match profanity
* commit '7f63d12edcdc28af007f1f5025f95c1552fd82d7':
|
2013-05-15 11:29:17 -07:00 |
|
Tadashi G. Takaoka
|
7a0c82b214
|
am f6cd82d7 : am 03fe0cf4 : am 3b892164 : am 7b2114a4 : Display still image when device can\'t play welcome video
* commit 'f6cd82d797f9c3629ea60fb1e6b52c0f45c8bb2e':
|
2013-05-15 11:29:16 -07:00 |
|
Jean Chalard
|
bfdb0fb12d
|
am 457b6ae8 : am a10c80fe : am 4aa48aed : am 019c3806 : am ace3f3c5 : am 25c90e6d : Merge "Don\'t do recorrection when suggestions are off." into jb-mr2-dev
* commit '457b6ae8ce49129ee9f50069b031ace8f3638ba7':
|
2013-05-15 11:29:15 -07:00 |
|
Baligh Uddin
|
5d9f408185
|
am 00078f79 : (-s ours) am 50925559 : (-s ours) am d2ea99b7 : am c9f49b88 : (-s ours) am b4251873 : (-s ours) am e5ae0bd3 : Import translations. DO NOT MERGE
* commit '00078f794bbab055ab36e1698b346c231b4808fd':
|
2013-05-15 11:29:13 -07:00 |
|
Baligh Uddin
|
7bde4523db
|
am 39afe052 : (-s ours) am 6242fca8 : (-s ours) am 8daffca0 : (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
* commit '39afe052f416e26589bc3a8fe98c75fe41659abd':
|
2013-05-15 11:29:12 -07:00 |
|
Tadashi G. Takaoka
|
8923d7679e
|
am 1e08d3d2 : am 6191026c : am 0caf3f6a : Merge "Introduce MoreSuggestionsListener class"
* commit '1e08d3d25930696e4614db53765d063a67e2b09a':
|
2013-05-15 11:28:09 -07:00 |
|
Satoshi Kataoka
|
1749dba188
|
am d53fb22a : am fcfa2cb2 : am 6314b845 : Merge "Add permissions for personalization"
* commit 'd53fb22a97c4e769f5bb5b5d7bd4d30a96490d7f':
|
2013-05-15 11:28:08 -07:00 |
|
Tadashi G. Takaoka
|
35952d7b74
|
am 2f6851d9 : am f405dc87 : am 17a35383 : Merge "Override View.drawableStateChanged to detect state_pressed"
* commit '2f6851d9da1c3ff7ef6b146a125508114f275cc6':
|
2013-05-15 11:28:06 -07:00 |
|
Satoshi Kataoka
|
7f63d12edc
|
am 6cf492e4 : am 941b288c : am df2eae6e : Fix exact match profanity
* commit '6cf492e4a4a6e729f556fd8d38646c8a5ab7e4ba':
|
2013-05-15 11:28:05 -07:00 |
|
Tadashi G. Takaoka
|
f6cd82d797
|
am 03fe0cf4 : am 3b892164 : am 7b2114a4 : Display still image when device can\'t play welcome video
* commit '03fe0cf4dd03028b84ef05f9a9519a51fb9977e6':
|
2013-05-15 11:28:04 -07:00 |
|
Jean Chalard
|
457b6ae8ce
|
am a10c80fe : am 4aa48aed : am 019c3806 : am ace3f3c5 : am 25c90e6d : Merge "Don\'t do recorrection when suggestions are off." into jb-mr2-dev
* commit 'a10c80fe3997a58ec938e23987ea9cc3bfb35cf6':
|
2013-05-15 11:28:03 -07:00 |
|
Baligh Uddin
|
00078f794b
|
am 50925559 : (-s ours) am d2ea99b7 : am c9f49b88 : (-s ours) am b4251873 : (-s ours) am e5ae0bd3 : Import translations. DO NOT MERGE
* commit '50925559f0fe56e01e1c5725bc6f3ebf96ade166':
|
2013-05-15 11:28:02 -07:00 |
|
Baligh Uddin
|
39afe052f4
|
am 6242fca8 : (-s ours) am 8daffca0 : (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
* commit '6242fca869936dfe313d75214a2b3b3050b47cb8':
Import translations. DO NOT MERGE
|
2013-05-15 11:28:01 -07:00 |
|
Tadashi G. Takaoka
|
1e08d3d259
|
am 6191026c : am 0caf3f6a : Merge "Introduce MoreSuggestionsListener class"
* commit '6191026ce4e4cc756f47135223f58318d35d3143':
Introduce MoreSuggestionsListener class
|
2013-05-15 11:26:02 -07:00 |
|
Satoshi Kataoka
|
d53fb22a97
|
am fcfa2cb2 : am 6314b845 : Merge "Add permissions for personalization"
* commit 'fcfa2cb24fe4151e28574d3da4397bcc04f3d50a':
Add permissions for personalization
|
2013-05-15 11:26:00 -07:00 |
|
Tadashi G. Takaoka
|
2f6851d9da
|
am f405dc87 : am 17a35383 : Merge "Override View.drawableStateChanged to detect state_pressed"
* commit 'f405dc87a8e61fe95c8e4ee5b81a2f4cd005dfd0':
Override View.drawableStateChanged to detect state_pressed
|
2013-05-15 11:25:59 -07:00 |
|
Satoshi Kataoka
|
6cf492e4a4
|
am 941b288c : am df2eae6e : Fix exact match profanity
* commit '941b288c0571eb591ce794a03ff399b6caa69370':
Fix exact match profanity
|
2013-05-15 11:25:57 -07:00 |
|
Tadashi G. Takaoka
|
03fe0cf4dd
|
am 3b892164 : am 7b2114a4 : Display still image when device can\'t play welcome video
* commit '3b8921646fb51b9bb91108cfc103a5feccbbbbe9':
Display still image when device can't play welcome video
|
2013-05-15 11:25:56 -07:00 |
|
Jean Chalard
|
a10c80fe39
|
am 4aa48aed : am 019c3806 : am ace3f3c5 : am 25c90e6d : Merge "Don\'t do recorrection when suggestions are off." into jb-mr2-dev
* commit '4aa48aedda0a8f945efbc94f1f5beb355d1c6060':
|
2013-05-15 11:25:55 -07:00 |
|
Baligh Uddin
|
50925559f0
|
am d2ea99b7 : am c9f49b88 : (-s ours) am b4251873 : (-s ours) am e5ae0bd3 : Import translations. DO NOT MERGE
* commit 'd2ea99b7b4e0421a0c0d7ede8301c4a270038a9d':
|
2013-05-15 11:25:54 -07:00 |
|
Baligh Uddin
|
6242fca869
|
am 8daffca0 : (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
* commit '8daffca0475fb830e5b24d0485942a25766e2bff':
Import translations. DO NOT MERGE
|
2013-05-15 11:25:53 -07:00 |
|
Ken Wakasa
|
8aed26b450
|
am 4c526225 : am 45fe5c34 : am 761b5586 : am a0b62ece : Merge "Cleanup an unused return value"
* commit '4c52622549357ae23c5e5b8755bdcdaf511d6317':
|
2013-05-15 11:23:57 -07:00 |
|
Tadashi G. Takaoka
|
53d9ed64f9
|
am cfb0c03c : am 24fc5ab6 : am f4a03ddc : am 1187ef9a : Merge "Catch error while playing welcome video"
* commit 'cfb0c03c1a9990579ba74fd7c9f65b496e185196':
|
2013-05-15 11:23:56 -07:00 |
|
Jean Chalard
|
4073675063
|
am 8e32cc2a : am 9db1f6d9 : am d618419d : am 37bbaea8 : Merge "[PB14] Cosmetic fixes to the progress bar"
* commit '8e32cc2a13870e06459cca7b3ec8247d9b6422c2':
|
2013-05-15 11:23:55 -07:00 |
|
Satoshi Kataoka
|
91a1b9539e
|
am dc7cff7c : am fa47814c : am f4d7c99c : am 71c1e50f : Merge "Fix the title of the fragment of the personal dictionary"
* commit 'dc7cff7c23a83880cecc02f67aeaaa3759b7b172':
|
2013-05-15 11:23:53 -07:00 |
|
Jean Chalard
|
c816430a77
|
am 3b765c2b : am bc81ac83 : am 69e1e45c : am 01170ffe : [PB13] Actually update the progress bar
* commit '3b765c2b7b6182c35c01db851b5c428b27ade133':
|
2013-05-15 11:23:52 -07:00 |
|
Tadashi G. Takaoka
|
f10231c469
|
am 0512fd40 : am 58434ae6 : am 3bcc7545 : am 965329c1 : Fix missing string reference of spellchecker.xml
* commit '0512fd40200ad28c39de98ab047a4c0f5a638d06':
|
2013-05-15 11:23:50 -07:00 |
|
Jean Chalard
|
868a805db8
|
am f022a0d8 : am 861d7cea : am 27c91662 : am 5f2efe0f : Merge "[PB12] Implement the progress bar update lifecycle"
* commit 'f022a0d83e7179884d2167f9476e5374b0c013f8':
|
2013-05-15 11:23:48 -07:00 |
|
Tom Ouyang
|
ff14144095
|
am 0806d8e5 : am f96eb7db : am a0a2b4c2 : am 8da0c932 : Reduce MAX_NORM_DISTANCE_FOR_EDIT in typing model after recent logic improvements
* commit '0806d8e5a96dd2a208349f1c7a71b3beaabd727d':
|
2013-05-15 11:23:47 -07:00 |
|
Keisuke Kuroynagi
|
e74f3239ce
|
am 0da5b5c6 : am 45115e6e : am 25a271bc : am 254949d8 : Merge "Fix: Demote first char capitalized new words."
* commit '0da5b5c6286cd8cf04b6414def0f5d90753f9530':
|
2013-05-15 11:23:45 -07:00 |
|
Jeff Sharkey
|
ffc58aa6b7
|
am 976eaf61 : am f892099b : am 238748d5 : am 7a800e79 : Merge "Avoid leaking AssetFileDescriptor."
* commit '976eaf61490120449e0b090c3cbc36c7436d1cdb':
|
2013-05-15 11:23:44 -07:00 |
|
Baligh Uddin
|
6d08423ac1
|
am 95a2ce5b : (-s ours) am 887d1af1 : (-s ours) am 9a60460a : am ed9ef5a7 : (-s ours) am af77854a : am 31a70de6 : Import translations. DO NOT MERGE
* commit '95a2ce5b2fd6566a52cb555c9d4859b51e95ed30':
|
2013-05-15 11:23:43 -07:00 |
|
Baligh Uddin
|
4947c0eba8
|
am 4241b708 : (-s ours) am 0adb4270 : (-s ours) am edb3fd1f : (-s ours) am fc281601 : (-s ours) am 8f4cad6f : (-s ours) am 78e92b5c : Import translations. DO NOT MERGE
* commit '4241b7089df19fffe1ccd1be47bfe01c7739b4d6':
|
2013-05-15 11:23:41 -07:00 |
|
Ken Wakasa
|
4c52622549
|
am 45fe5c34 : am 761b5586 : am a0b62ece : Merge "Cleanup an unused return value"
* commit '45fe5c3429e0dae77fd809ac6ae4460ca0e55230':
|
2013-05-15 11:22:24 -07:00 |
|
Tadashi G. Takaoka
|
cfb0c03c1a
|
am 24fc5ab6 : am f4a03ddc : am 1187ef9a : Merge "Catch error while playing welcome video"
* commit '24fc5ab65ff0cb53dea2d7beef3f7bbd64fcbbec':
|
2013-05-15 11:22:23 -07:00 |
|
Jean Chalard
|
8e32cc2a13
|
am 9db1f6d9 : am d618419d : am 37bbaea8 : Merge "[PB14] Cosmetic fixes to the progress bar"
* commit '9db1f6d9c6e2b656e587e2dee2a63c89db9e7e1b':
|
2013-05-15 11:22:22 -07:00 |
|
Satoshi Kataoka
|
dc7cff7c23
|
am fa47814c : am f4d7c99c : am 71c1e50f : Merge "Fix the title of the fragment of the personal dictionary"
* commit 'fa47814ca321cc7132540f4707586988ae0c85f2':
|
2013-05-15 11:22:20 -07:00 |
|
Jean Chalard
|
3b765c2b7b
|
am bc81ac83 : am 69e1e45c : am 01170ffe : [PB13] Actually update the progress bar
* commit 'bc81ac838ae16277388c709aa97222600ec6916d':
|
2013-05-15 11:22:19 -07:00 |
|