Commit graph

20312 commits

Author SHA1 Message Date
Kurt Partridge
78ca46811f am b4231951: am af15c959: am c8d50d47: am e3a72c9b: am ff80ee20: Merge "Modify isAllowedToLog"
* commit 'b42319515148136fc4a01aeb76d57e7dd2a45e96':
2013-10-03 14:50:32 -07:00
The Android Open Source Project
b6e68b4ed1 am 8c910aa1: am 626d6e47: (-s ours) am 378164a5: (-s ours) am 8b26ab26: (-s ours) am ea88e2ff: (-s ours) am 150da225: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '8c910aa1e5558ab7c5c5f939e6cb1f671aeec077':
2013-10-03 14:50:29 -07:00
Jean Chalard
f2ce81a8bb am 9e590f21: am 88ee75d9: am 7818c9ff: am bab46b4a: am d96f63d2: am e2bee5b1: am ede3db51: Merge "Fix a crash on a secondary user" into jb-mr2-dev
* commit '9e590f219857e207f43fb097368a28deff0baf93':
2013-10-03 14:50:26 -07:00
Baligh Uddin
71339df26d am 264c88e4: (-s ours) am ddcca5df: (-s ours) am 13bb5a8a: (-s ours) am 7408a092: (-s ours) am 88fcf65f: (-s ours) am 13d7d568: (-s ours) am 23bff513: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '264c88e4ed67dc8ead16c584c13190127fa4f45c':
2013-10-03 14:50:23 -07:00
Baligh Uddin
b1a4c5089c am 5410cdad: (-s ours) am 06168df6: (-s ours) am 29ac49d0: (-s ours) am 93125247: (-s ours) am 7f008a62: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '5410cdad48f62d104a2665dc3566be59dc842a99':
2013-10-03 14:50:20 -07:00
Baligh Uddin
6304d29b42 am 90a875ed: (-s ours) am fc6fa43b: (-s ours) am f29ecf9b: (-s ours) am 27ee1f20: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
* commit '90a875ed4fdd21e408e04a371be4245b2d212c07':
2013-10-03 14:50:15 -07:00
Jean Chalard
fe2cadafec am 45873fd8: am b993db06: am 9b0bc1d3: am 56dba59a: am 05ea7c5d: am 167ba345: am 89fe1f50: Add a method to work around apps broken by recorrection
* commit '45873fd880218d99121b75b4b6aeddb0172ef80f':
2013-10-03 14:50:12 -07:00
Tadashi G. Takaoka
048b9be752 am ecff2e4b: am 36ba71fa: am f6a70ad5: am d3cf6715: am a6639636: Merge "Remove unnecessary @UsedForTesting annotation"
* commit 'ecff2e4bd4b2984afe434fa23b70e93b555931db':
2013-10-03 14:50:09 -07:00
Jean Chalard
e5a4442a3b am edf9db69: am 50a3cfbf: am 5f05a1f3: am 2380f927: am 0013f97d: am 5906b05b: am 7058b02a: Extract a new class for app-specific workarounds.
* commit 'edf9db698a6fc3f56bcd2906fdc46f70383c8051':
2013-10-03 14:50:06 -07:00
The Android Open Source Project
6a1e1b4ccd am 39e82fb5: am c9e08527: (-s ours) am 87fa6995: (-s ours) am f8ce1ffa: (-s ours) am eb724ddb: (-s ours) am 7f78bd5e: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '39e82fb5fe9817540c874f6902483e2d996f7335':
2013-10-03 14:50:03 -07:00
Kurt Partridge
ed772e02c3 am 9ecf1b97: am 7d4c42af: am e348a313: am ec6e5d37: am de4e579c: Merge "Fix punctuation logging"
* commit '9ecf1b97ec8072491d2446d080fa1dae8c2d4433':
2013-10-03 14:49:59 -07:00
The Android Open Source Project
0503ac4247 am 6093b8ef: am 24616eff: (-s ours) am e6098b20: (-s ours) am 265861dc: (-s ours) am 82c852cb: (-s ours) am b528e251: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '6093b8ef6fb15fa0512fe7635a53591a1ef227c3':
2013-10-03 14:49:56 -07:00
Kurt Partridge
dd6592ef3e am 502d0584: am 2d9093a1: am a9c36271: am f83050d9: am 17b63ba5: Merge "Remove unnecessary commit/uncommit"
* commit '502d0584b8f85180cc4bdd723ef3c302d4473ae5':
2013-10-03 14:49:53 -07:00
Kurt Partridge
883e11179c am 2c6d72d9: am 1ea4319b: am 77907a94: am 577bc298: am 7af5300c: Merge "Add claifying comment"
* commit '2c6d72d949e27632accefc947bfca2bd367c0058':
2013-10-03 14:49:50 -07:00
Jean Chalard
d662a4b285 am 0f74a347: am 9f405afa: am f7877678: am 9a606af4: am a404e365: am d40b4729: am b1e37e4a: am f1dcf725: Merge "Don\'t process recorrection or resets when not shown"
* commit '0f74a347a0abd553156a88d186f98e5996055c42':
2013-10-03 14:49:47 -07:00
Tadashi G. Takaoka
d6ab843da5 am 5ed2c649: am 2153eda7: am 22e449c6: am a12f001d: am c3c879ed: am ff0bd7db: am 25f0c808: am 96a9f357: Merge "Fix unintentional setup step advance in orientation change"
* commit '5ed2c6495fed4bce45ba55c50b958c3c16554a80':
2013-10-03 14:49:44 -07:00
Tadashi G. Takaoka
ab0f78bba0 am 0b6aaf0b: am 0b9b70da: am 40a295dc: am 84828e15: am ad6df987: am d6a7a26d: am d59c1f83: am 50259c70: Merge "Tune layout parameters of setup wizard"
* commit '0b6aaf0b0b8ed8b150e39b6a51d7aa7bef89bcbd':
2013-10-03 14:49:41 -07:00
Tadashi G. Takaoka
70420b7100 am c430cb13: am 7ea5d079: am b3a6419d: am 9e990883: am feb169cb: am e7ef9669: am 7d9bd6f5: am 66b87269: Update welcome fallback image (using xhdpi asset)
* commit 'c430cb132b3a160d77c92e161c5e99c69b6f8097':
2013-10-03 14:49:38 -07:00
Tadashi G. Takaoka
f33087a8f3 am ca01d5f2: am db6591a3: am d4af111f: am aa9d2ae3: am ce0273c2: am 883905f4: am 7fe67544: am 769427cf: Adjust aspect ratio of setup image
* commit 'ca01d5f2f78a54956495d8ddf4ee5c59db4192cd':
2013-10-03 14:49:35 -07:00
The Android Automerger
89a457ec3d am b4955bdf: am c532c519: am d8ac191f: am 8aec7fad: am e0d3bb2c: am b6161b40: am 66c5f8cb: merge in jb-ub-latinimegoogle-azuki history after reset to jb-ub-latinimegoogle
* commit 'b4955bdfd71edd600d4a917ec966024441915e6e':
2013-10-03 14:49:32 -07:00
Kurt Partridge
8f92042345 am 3b341f8d: am b78340ba: am ccbb662e: am 6a923429: am ba4e480c: am 39afaf3d: am 6d0f0347: am b2d53be7: Merge "Remove FeedbackLog instance variables."
* commit '3b341f8de568257115efa1b14e50cde63e40fde6':
2013-10-03 14:49:30 -07:00
Tadashi G. Takaoka
3ba0ce1042 am 559a2bee: am 97e4d4b4: am 3cac8bf4: am c1c3df70: am 091bcabf: am 46bf9f49: am 4e3a8afd: am 8b56ad78: Merge "Revise welcome screen video and still image"
* commit '559a2beeaf3c43e628d43358c1db7c688578f74e':
2013-10-03 14:49:27 -07:00
Ken Wakasa
ca25c6106e am de68ec72: am 94ee7b39: am 9da1f073: am 15cec207: am 7a724805: am acb37023: am 23bfac83: am d78c776b: Merge "Adjust sampling interval for gesture stroke drawing a bit."
* commit 'de68ec723b5f99c55465aa62007ca8c9e12dc14e':
2013-10-03 14:49:25 -07:00
Ken Wakasa
feb308fef6 am 0a672d86: am 1f413d84: am 784a961b: am 212798bf: am d8e8b007: am 5ee11c5d: am 2e0fc8bf: am d6d70e73: Merge "Revert "Fix isSuggestionsStripVisible when keyboard hidden""
* commit '0a672d86ddf2ea8b431c8f22a8ec296de34049bb':
2013-10-03 14:49:17 -07:00
Tadashi G. Takaoka
fb7ae63ad8 am 0601cb49: am b93e782b: am d16eb1a3: am fe84bbd1: am 315e8fac: am 8e7b1739: am 3fff5179: am 41016aca: Back to previous keyboard layout by canceling sliding input
* commit '0601cb49eea53fe62fc5134baff276d7f5823072':
2013-10-03 14:49:14 -07:00
Tadashi G. Takaoka
20dfc9e0c5 am 2ca3986c: am 5a240612: am bcccd22e: am 07ba843c: am 7ab91dfe: am 03f2ca6d: am f46eafe2: am c9398a3b: Merge "Fix PointerTrackerQueue.releaseAllPointerOlderThan"
* commit '2ca3986ca585039acc3fad85fb8b0583a2380baa':
2013-10-03 14:49:10 -07:00
Jean Chalard
ec758d69a0 am 282d9bba: am 002039dd: am 00090e11: am 00d00767: am a1912d14: am 95586abc: am dccad3ef: am cb0d1c4c: Fix isSuggestionsStripVisible when keyboard hidden
* commit '282d9bba8905992a3cd3cf0feb81cae5b600eac8':
2013-10-03 14:49:08 -07:00
Baligh Uddin
1f0a9bd469 am 7c3ffb45: (-s ours) am 905f34ff: (-s ours) am 5576afdb: (-s ours) am 7897e758: (-s ours) am d64589b4: (-s ours) am 8587e879: (-s ours) am 5ec5e0b6: am e69066d1: (-s ours) Import translations. DO NOT MERGE
* commit '7c3ffb45274df4a093f6fcfcca0170968e4395e9':
2013-10-03 14:49:05 -07:00
Baligh Uddin
e6f0442628 am db1f0ac7: (-s ours) am a5f03a1f: (-s ours) am efcd9c78: (-s ours) am fff0c8a9: (-s ours) am 29cfa87b: (-s ours) am fd2c2e62: (-s ours) am 298d8232: (-s ours) Import translations. DO NOT MERGE
* commit 'db1f0ac769b7a5e191df93719a2f8fcece5a2ff1':
2013-10-03 14:49:02 -07:00
Tadashi G. Takaoka
ec517ec7fe am d0648d66: am 8185b774: am 4e7c1637: am f6270ab2: am b76d1737: am 2d86b73f: am 035c68a1: am b121538e: Tune maximum keypress duration to 100 milliseconds
* commit 'd0648d66c06bbdb0c11625ded33665bb5e0b2f92':
2013-10-03 14:48:59 -07:00
Tadashi G. Takaoka
ec462f9f4c am 5ced4cf2: am e3748ed9: am a295927b: am c8d6683a: am aeff9902: am 7e52c35d: am 94c54eca: am e8336aa8: Merge "Fix keypress vibration duration of HTC One X"
* commit '5ced4cf251d85919cb3a00de6e835ebac6575ce4':
2013-10-03 14:48:56 -07:00
Tadashi G. Takaoka
b31c6518f4 am b1c6ffd3: am 63fc524f: am 61629255: am c05c2526: am 93a1540a: am f1973350: am a70da988: am 5f857a35: Merge "Disable functional key while in sliding input mode"
* commit 'b1c6ffd33e49a68ae3f076bfc495634d08eb02bb':
2013-10-03 14:48:53 -07:00
Tadashi G. Takaoka
8df36e6c35 am 1ba88ee3: am 70912057: am 00204d85: am a0167db8: am 4103044a: am c731457f: am f6b5484d: am b5f67e7f: Add device specific keypress vibration duration database
* commit '1ba88ee32817a1252855d7398bbb687aa05aea46':
2013-10-03 14:48:49 -07:00
Tadashi G. Takaoka
0d2efd20d8 am c70c32a4: am 84627c43: am 484545c4: am db40c5d7: am 81fabdb8: am 73673b4c: am f1708394: am 0efd8d1b: Fix landscape override value expression
* commit 'c70c32a476a73321c4cc10d89a45d46a09d2bf45':
2013-10-03 14:48:46 -07:00
Tadashi G. Takaoka
e0a201be13 am 6d20e50f: am df4b9eaa: am ce291bfc: am 6399108c: am 209a97bb: am 7a876b31: am 813ba9f5: am 6b0bcfba: Merge "Disable long press timer while sliding input mode"
* commit '6d20e50f440e945b877b8b1ae1c38996b39fac47':
2013-10-03 14:48:43 -07:00
Tadashi G. Takaoka
3ebbd86db5 am 3f080835: am db0cc3d5: am a8aa563b: am 4268fdea: am f05eeecc: am 94ad2ef7: am 094447bd: am ad662ade: Disable delete key repeating while in slide input mode
* commit '3f080835db58048852ec3aecb146fb897a85dca2':
2013-10-03 14:48:40 -07:00
Tadashi G. Takaoka
294b2c178a am 4501c75b: am 1ace0735: am 7ff5db64: am 7c856e16: am cae4cd7b: am 66e5e05f: am 6780e43d: am 18184eac: Support regular expression for condition pattern
* commit '4501c75b20f18e1f36677ebcd61e88a1a3b2846e':
2013-10-03 14:48:31 -07:00
Tadashi G. Takaoka
aef8af97d0 am c8a5fe51: am 20d4751f: am a3ec57b3: am de1115a8: am 4c6fe8ed: am aaf7d70b: am 6f647842: am ec83457d: Merge "Support multiple condition for getDeviceOverrideValue"
* commit 'c8a5fe51c598ef6a010c7a18d0f23efab9057133':
2013-10-03 14:48:28 -07:00
Ken Wakasa
146acafc1b am 184fc484: am 77d61817: am 451b6c3b: am 99effbc0: am 645b62fb: am 8738eeaf: am 01c133d7: am cb3bba3c: Rename GesturePreviewTrail.java -> GestureTrail.java
* commit '184fc484d025bc1a94fbe1cfa89ad0563a879a1b':
2013-10-03 14:48:19 -07:00
Kurt Partridge
0cc0e39b09 am 0df768ab: am 54eb5bbb: am 1831d86e: am 772990b6: am 22fa8123: am 7bc99237: am 03a32146: am 7d72ca0b: Avoid JsonWriter multi-write error
* commit '0df768ab297b608124593f602fe0583baddf0cd9':
2013-10-03 14:48:17 -07:00
Kurt Partridge
81dde43f68 am 95d84f60: am cbbe8f2e: am ceedfcc5: am 1da572e1: am 7c2ca940: am 1e0f8cff: am 697f6abb: am 260df841: Merge "Remove unused code"
* commit '95d84f6054ef1250babf9657f38a9e90ede5e36a':
2013-10-03 14:48:13 -07:00
Kurt Partridge
de65abbd6d am 011edb32: am 2d82e679: am 2325e858: am 5975a02e: am 28b9aec4: am eaf5c227: am 026b2645: am bb17034f: Merge "Remove ref to LatinImeLogger preference."
* commit '011edb32a054882dcfaacc5bd4a27fb87a76f98b':
2013-10-03 14:48:10 -07:00
Kurt Partridge
1a0556c3d9 am 3b601576: am c188bb61: am 548778d3: am 398e03ea: am 3ffe11a5: am 4ee6df8d: am 1f8b354c: am 4135c2db: Merge "Avoid NPE by fixing ResearchLogger initialization"
* commit '3b60157638f442eb7d5fc592a8485e365c1a5e05':
2013-10-03 14:48:08 -07:00
Tadashi G. Takaoka
710790b000 am 435ded26: am e17d367e: am 38a30fb0: am e3158e93: am aca3b625: am 941e8bba: am a01ab9ea: am 565ced45: Merge "Refactor StringUtils.findPrefixedString to findValueOfKey"
* commit '435ded26209799061546b9041445fb904ea80883':
2013-10-03 14:48:05 -07:00
Tadashi G. Takaoka
faabe9bf0f am 53b0617e: am 7ae37424: am 9e533398: am 2ffe29b6: am 4b18d513: am e90fe9c3: am afc40e74: am 4705c0fa: Fix screen flash when launching settings activity
* commit '53b0617e40715c8d7ecfd3538258c6277845f47b':
2013-10-03 14:48:02 -07:00
Tadashi G. Takaoka
bafb58287b am 7184208a: am 575d06f5: am 5e0d0242: am dfd21666: am 82e697bf: am 05aa5e75: am 48002809: am 2b5c9726: Introduce another activity to launch setup wizard
* commit '7184208a193f7b921810aa2622703459e402bb8b':
2013-10-03 14:47:58 -07:00
Tadashi G. Takaoka
18ad05625f am 8912e833: am 218ab2a2: am db6feecd: am c7f2031d: am 1784791c: am 82e3ea95: am e7de0ce7: am 5ffa5bf3: Merge "Keep SetupActivity alive to check re-launching from launcher"
* commit '8912e833f90ece2e788fd49e780b9164129172b9':
2013-10-03 14:47:55 -07:00
Jean Chalard
76b08e5aee am dd512e68: am 86749e88: am 14a54c67: am b5feac06: am b2e4031e: am 28eab9d5: am 07905b6a: am 2564bd09: Merge "Reuse old preferences if possible."
* commit 'dd512e6805ca7b7e3609cc13caeffd3ec9261dd8':
2013-10-03 14:47:52 -07:00
Satoshi Kataoka
b912a40175 am 6ec1713f: am faeb31e4: am cb3e8f9c: am bcc04608: am 94734c93: am 1884044e: am 81662dd4: am ba35426f: Merge "Tweak a label in the personal dictionary settings"
* commit '6ec1713f080890bd6b64ad824e78d57feb22cf2e':
2013-10-03 14:47:49 -07:00
Tadashi G. Takaoka
0740e03888 am 091210b5: am 206eebbd: am 81b92a35: am 78296e91: am aab8a18b: am 1cb72a09: am 384d4e5b: am 2ad7023c: Fix detecting out of keyboard area
* commit '091210b575ea2275d74852c9b0b36488f5f38a02':
2013-10-03 14:47:46 -07:00