Commit Graph

13873 Commits (adf82a97a9f087060ee0f2e7d555e2c0110d85af)

Author SHA1 Message Date
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 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
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 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