Commit graph

14141 commits

Author SHA1 Message Date
Ken Wakasa
db3591a883 am df354cb1: am 6c97d676: am 4c7474d5: am c5a29fa8: Revert "Fix exact match profanity"
* commit 'df354cb1ec284014afb4238c0cd2b2cac79224bd':
2013-05-15 12:39:49 -07:00
Tadashi G. Takaoka
3fe6c4f42d am 3792fa4b: am 4e8fde00: am a36266dd: am a5be033d: Preserve setup wizard step while orientation change
* commit '3792fa4b313c41931ca474eccb5ba91406d78ea1':
2013-05-15 12:39:48 -07:00
Tadashi G. Takaoka
4565c8b2de am db92fe62: am 3c93fdc8: am 9bb189f6: am 7d19ab5c: Using int instead of booleans to save keyboard shift state
* commit 'db92fe6294fbce01fd534a34c5e931e00545bd8c':
2013-05-15 12:39:46 -07:00
Tadashi G. Takaoka
13afe2ca71 am 503ab45a: am 62dd1ee3: am 3c1a18c6: am 7f8dd50b: Save automatic shift state while orientation changing
* commit '503ab45a6f52be0ce0a1fcdb6d3895b771895cbe':
2013-05-15 12:39:44 -07:00
Baligh Uddin
deeaf9aedb am da33179c: (-s ours) am 0a0b9fe2: (-s ours) am 276ed0d6: (-s ours) am 9e0ffd35: (-s ours) am f9a4732e: (-s ours) am f7e4057f: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit 'da33179c195534fe68ecb553cec484177615502a':
2013-05-15 12:39:43 -07:00
Ken Wakasa
df354cb1ec am 6c97d676: am 4c7474d5: am c5a29fa8: Revert "Fix exact match profanity"
* commit '6c97d676eb57f29db9441442228e597fd4ab1696':
2013-05-15 12:38:53 -07:00
Tadashi G. Takaoka
3792fa4b31 am 4e8fde00: am a36266dd: am a5be033d: Preserve setup wizard step while orientation change
* commit '4e8fde004f3d22e7c4d6eba0e6a0a55c3a2af5bd':
2013-05-15 12:38:52 -07:00
Tadashi G. Takaoka
db92fe6294 am 3c93fdc8: am 9bb189f6: am 7d19ab5c: Using int instead of booleans to save keyboard shift state
* commit '3c93fdc8e02d167eb4e6883fc8bc0f97bf0fc104':
2013-05-15 12:38:50 -07:00
Tadashi G. Takaoka
503ab45a6f am 62dd1ee3: am 3c1a18c6: am 7f8dd50b: Save automatic shift state while orientation changing
* commit '62dd1ee3aab4844be50eb280e06626edcb5fff4b':
2013-05-15 12:38:49 -07:00
Baligh Uddin
da33179c19 am 0a0b9fe2: (-s ours) am 276ed0d6: (-s ours) am 9e0ffd35: (-s ours) am f9a4732e: (-s ours) am f7e4057f: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '0a0b9fe27e1850c57651c64260f83eb1601cc37b':
2013-05-15 12:38:47 -07:00
Ken Wakasa
6c97d676eb am 4c7474d5: am c5a29fa8: Revert "Fix exact match profanity"
* commit '4c7474d501f672986770085193aded27d64aaaa4':
  Revert "Fix exact match profanity"
2013-05-15 12:35:30 -07:00
Tadashi G. Takaoka
4e8fde004f am a36266dd: am a5be033d: Preserve setup wizard step while orientation change
* commit 'a36266dd5840d645e46b18e41ebcdbea4a21c0e4':
  Preserve setup wizard step while orientation change
2013-05-15 12:35:28 -07:00
Tadashi G. Takaoka
3c93fdc8e0 am 9bb189f6: am 7d19ab5c: Using int instead of booleans to save keyboard shift state
* commit '9bb189f6131eda218bd76a055a3f4c83fbd0d088':
  Using int instead of booleans to save keyboard shift state
2013-05-15 12:35:27 -07:00
Tadashi G. Takaoka
62dd1ee3aa am 3c1a18c6: am 7f8dd50b: Save automatic shift state while orientation changing
* commit '3c1a18c6a6540300aea96b3195920f5a1e159e09':
  Save automatic shift state while orientation changing
2013-05-15 12:35:25 -07:00
Baligh Uddin
0a0b9fe27e am 276ed0d6: (-s ours) am 9e0ffd35: (-s ours) am f9a4732e: (-s ours) am f7e4057f: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '276ed0d6a75e8ed2201ebf7adc2e0bcb410ae0c3':
2013-05-15 12:35:25 -07:00
Baligh Uddin
bdf7113cb9 am c7f37218: (-s ours) am bc6fd1a6: (-s ours) am 11d4d240: am 39b3bf8d: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit 'c7f372189bf4017740fbd10b3f746a5bbcc90c5b':
2013-05-15 12:34:27 -07:00
Baligh Uddin
62bf6fa57d am 0ffe46a1: (-s ours) am a8fb8b4b: (-s ours) am e351e10a: Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
* commit '0ffe46a1ac380483aa00b97e47376a180cada279':
2013-05-15 12:34:26 -07:00
Baligh Uddin
d72c805d1f am a2942457: (-s ours) am 168d43d7: (-s ours) am dde8e9e3: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
* commit 'a294245709ddbaa97e369f7ad5c2c639c60f0648':
2013-05-15 12:34:24 -07:00
Baligh Uddin
c7f372189b am bc6fd1a6: (-s ours) am 11d4d240: am 39b3bf8d: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit 'bc6fd1a6cfe6814572064904a82a581358c120ad':
2013-05-15 12:31:48 -07:00
Baligh Uddin
0ffe46a1ac am a8fb8b4b: (-s ours) am e351e10a: Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
* commit 'a8fb8b4bb445517691a610cea4925369f016e7b2':
  Import translations. DO NOT MERGE
2013-05-15 12:31:47 -07:00
Baligh Uddin
a294245709 am 168d43d7: (-s ours) am dde8e9e3: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
* commit '168d43d73f124f07713afd06a05ee66600d2622a':
  Import translations. DO NOT MERGE
2013-05-15 12:31:46 -07:00
Tadashi G. Takaoka
59b9335488 am 2a06798e: am 6600b06c: am cd196fd5: am 307f49b8: Mark some unit tests as @MediumTest
* commit '2a06798ea19d07a8090dfa34866a95536a030c40':
2013-05-15 12:30:10 -07:00
Satoshi Kataoka
8fad5d8341 am 6f9617ab: (-s ours) am 77c6d2bb: (-s ours) am 25a713d6: am 11b9f680: (-s ours) am e5daf660: (-s ours) am 6845427e: DO NOT MERGE: Return possible suggestions in Google Spell Checker
* commit '6f9617ab054244ba241423482e8d555e6b07c90e':
2013-05-15 12:30:09 -07:00
Jean Chalard
d0981b0f02 am 771b60ba: am e229cd97: am d8e55277: am 83757d43: Merge "Pass blockOffensiveWords as a parameter"
* commit '771b60bad47f0c5926909eba900ec17c7dde16f1':
2013-05-15 12:30:07 -07:00
Ken Wakasa
43d34fb851 am af1196dd: am f415cc6b: am 56550ee5: am 1490b534: Cleanup -- follow up to Ief04a4abb6dc1f79660a2e419c9c5e271802b5a1
* commit 'af1196dd333b9d470bee5c27b6db3b4e2090f183':
2013-05-15 12:30:05 -07:00
Satoshi Kataoka
f00f84a7cc am 679bff89: am 8781e3b6: am 483fc6f1: am c43417fb: Fix build
* commit '679bff8914b04c03cb48a57c3cea93374c3ebb09':
2013-05-15 12:30:04 -07:00
Jean Chalard
0c179788b4 am 1b62da75: am 6b93b185: am 3eee5cd2: am 53b37dc0: Merge "Fix a layout problem for pre-MR2"
* commit '1b62da7530c8b12bcc8cd0dad83b878ac0257250':
2013-05-15 12:30:02 -07:00
Baligh Uddin
bc6fd1a6cf am 11d4d240: am 39b3bf8d: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '11d4d240816659a91452f3e8c9df6b07443ed2fe':
  Import translations. DO NOT MERGE
2013-05-15 12:29:36 -07:00
Baligh Uddin
a8fb8b4bb4 am e351e10a: Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
* commit 'e351e10a68ad6e934ee3cfdd6456f9474d76facb':
  Import translations. DO NOT MERGE
2013-05-15 12:29:35 -07:00
Baligh Uddin
168d43d73f am dde8e9e3: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
* commit 'dde8e9e371ed743fc05bf076ca6d084df13d3e87':
  Import translations. DO NOT MERGE
2013-05-15 12:29:35 -07:00
Tadashi G. Takaoka
2a06798ea1 am 6600b06c: am cd196fd5: am 307f49b8: Mark some unit tests as @MediumTest
* commit '6600b06caa1812507adfa6056ab086ddc0b43724':
2013-05-15 12:28:16 -07:00
Satoshi Kataoka
6f9617ab05 am 77c6d2bb: (-s ours) am 25a713d6: am 11b9f680: (-s ours) am e5daf660: (-s ours) am 6845427e: DO NOT MERGE: Return possible suggestions in Google Spell Checker
* commit '77c6d2bb7743065daf9dd6fa76d2dd6ca34eca7b':
2013-05-15 12:28:14 -07:00
Jean Chalard
771b60bad4 am e229cd97: am d8e55277: am 83757d43: Merge "Pass blockOffensiveWords as a parameter"
* commit 'e229cd9743a76fb8ffe6ba2053ef0512e9be1a58':
2013-05-15 12:28:13 -07:00
Ken Wakasa
af1196dd33 am f415cc6b: am 56550ee5: am 1490b534: Cleanup -- follow up to Ief04a4abb6dc1f79660a2e419c9c5e271802b5a1
* commit 'f415cc6ba83ed6cbad9b4d394ded0acedb89323c':
2013-05-15 12:28:12 -07:00
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
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