Commit graph

14003 commits

Author SHA1 Message Date
Satoshi Kataoka
679bff8914 am 8781e3b6: am 483fc6f1: am c43417fb: Fix build
* commit '8781e3b61abaca8b9b629bd51bf6544319955459':
2013-05-15 12:28:10 -07:00
Jean Chalard
1b62da7530 am 6b93b185: am 3eee5cd2: am 53b37dc0: Merge "Fix a layout problem for pre-MR2"
* commit '6b93b185efbe6e2ce876f962783799464c081f62':
2013-05-15 12:28:09 -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
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
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
Tadashi G. Takaoka
0512fd4020 am 58434ae6: am 3bcc7545: am 965329c1: Fix missing string reference of spellchecker.xml
* commit '58434ae636d9209ce9f2fb046ca52a8d3b73b832':
2013-05-15 11:22:18 -07:00
Jean Chalard
f022a0d83e am 861d7cea: am 27c91662: am 5f2efe0f: Merge "[PB12] Implement the progress bar update lifecycle"
* commit '861d7cea303fe52d7e59c1f6af36206d2f50f33f':
2013-05-15 11:22:16 -07:00
Tom Ouyang
0806d8e5a9 am f96eb7db: am a0a2b4c2: am 8da0c932: Reduce MAX_NORM_DISTANCE_FOR_EDIT in typing model after recent logic improvements
* commit 'f96eb7db873c368f507da034e2a8509d8c957428':
2013-05-15 11:22:15 -07:00
Keisuke Kuroynagi
0da5b5c628 am 45115e6e: am 25a271bc: am 254949d8: Merge "Fix: Demote first char capitalized new words."
* commit '45115e6e1b52044e89d96f09ccda743605decdde':
2013-05-15 11:22:14 -07:00
Jeff Sharkey
976eaf6149 am f892099b: am 238748d5: am 7a800e79: Merge "Avoid leaking AssetFileDescriptor."
* commit 'f892099b3e57f59453ebd35134757afbb61820a4':
2013-05-15 11:22:13 -07:00
Baligh Uddin
95a2ce5b2f am 887d1af1: (-s ours) am 9a60460a: am ed9ef5a7: (-s ours) am af77854a: am 31a70de6: Import translations. DO NOT MERGE
* commit '887d1af14905126883b08f8dfe1c332cbdb7bd6d':
2013-05-15 11:22:11 -07:00
Baligh Uddin
4241b7089d am 0adb4270: (-s ours) am edb3fd1f: (-s ours) am fc281601: (-s ours) am 8f4cad6f: (-s ours) am 78e92b5c: Import translations. DO NOT MERGE
* commit '0adb427006d51f3665b2e7072a7476863ea7baae':
2013-05-15 11:22:10 -07:00
Ken Wakasa
45fe5c3429 am 761b5586: am a0b62ece: Merge "Cleanup an unused return value"
* commit '761b5586a74f86b269335884fef4ab23eadc69f1':
  Cleanup an unused return value
2013-05-15 11:19:48 -07:00
Tadashi G. Takaoka
24fc5ab65f am f4a03ddc: am 1187ef9a: Merge "Catch error while playing welcome video"
* commit 'f4a03ddcf85a546a7ed9eb59840fd81e4c014de9':
  Catch error while playing welcome video
2013-05-15 11:19:36 -07:00
Jean Chalard
9db1f6d9c6 am d618419d: am 37bbaea8: Merge "[PB14] Cosmetic fixes to the progress bar"
* commit 'd618419d16865f9cc54ec893873bab514b321815':
  [PB14] Cosmetic fixes to the progress bar
2013-05-15 11:19:35 -07:00
Satoshi Kataoka
fa47814ca3 am f4d7c99c: am 71c1e50f: Merge "Fix the title of the fragment of the personal dictionary"
* commit 'f4d7c99cda24fb5747843a47cd8a4423c315f685':
  Fix the title of the fragment of the personal dictionary
2013-05-15 11:19:28 -07:00
Jean Chalard
bc81ac838a am 69e1e45c: am 01170ffe: [PB13] Actually update the progress bar
* commit '69e1e45c012f5f1c1fa1ec8d096c806c99459ffe':
  [PB13] Actually update the progress bar
2013-05-15 11:19:12 -07:00
Tadashi G. Takaoka
58434ae636 am 3bcc7545: am 965329c1: Fix missing string reference of spellchecker.xml
* commit '3bcc75456fc01327e8358468131e8daf6095da98':
  Fix missing string reference of spellchecker.xml
2013-05-15 11:19:00 -07:00
Jean Chalard
861d7cea30 am 27c91662: am 5f2efe0f: Merge "[PB12] Implement the progress bar update lifecycle"
* commit '27c91662723f3b4252cff0ecef632156a2162316':
  [PB12] Implement the progress bar update lifecycle
2013-05-15 11:18:43 -07:00
Tom Ouyang
f96eb7db87 am a0a2b4c2: am 8da0c932: Reduce MAX_NORM_DISTANCE_FOR_EDIT in typing model after recent logic improvements
* commit 'a0a2b4c2fc7ade9e8dbdb26d82b100cc444bef25':
  Reduce MAX_NORM_DISTANCE_FOR_EDIT in typing model after recent logic improvements
2013-05-15 11:18:32 -07:00
Keisuke Kuroynagi
45115e6e1b am 25a271bc: am 254949d8: Merge "Fix: Demote first char capitalized new words."
* commit '25a271bc01671ac7bb5000bfad65e2cb51e4ad4a':
  Fix: Demote first char capitalized new words.
2013-05-15 11:18:25 -07:00
Jeff Sharkey
f892099b3e am 238748d5: am 7a800e79: Merge "Avoid leaking AssetFileDescriptor."
* commit '238748d57c8ba770be4c3e34fa6d704893de3d07':
  Avoid leaking AssetFileDescriptor.
2013-05-15 11:17:59 -07:00
Baligh Uddin
887d1af149 am 9a60460a: am ed9ef5a7: (-s ours) am af77854a: am 31a70de6: Import translations. DO NOT MERGE
* commit '9a60460ac0fb9a5ee4628639aac7d8106e368426':
2013-05-15 11:17:32 -07:00
Baligh Uddin
0adb427006 am edb3fd1f: (-s ours) am fc281601: (-s ours) am 8f4cad6f: (-s ours) am 78e92b5c: Import translations. DO NOT MERGE
* commit 'edb3fd1f29cbe7f746a8ea671314c7278d167864':
2013-05-15 11:17:32 -07:00