Commit graph

20722 commits

Author SHA1 Message Date
The Android Open Source Project
ac96dac76b am b6e68b4e: (-s ours) 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 'b6e68b4ed18dcb818709b96aba06ee1f377d612e':
2013-10-03 16:08:16 -07:00
Jean Chalard
50261d5c45 am f2ce81a8: 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 'f2ce81a8bb3a01f0a32e9182b91f495fc22b8023':
2013-10-03 16:08:13 -07:00
Baligh Uddin
0c8f3292e7 am 71339df2: (-s ours) 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 '71339df26d9218ebbd08e2fdd2c3deeca351f808':
2013-10-03 16:08:11 -07:00
Baligh Uddin
5b59a52bfe am b1a4c508: (-s ours) 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 'b1a4c5089c73bfccbc467cf5b6d61dcb3553684b':
2013-10-03 16:08:08 -07:00
Baligh Uddin
50f288285e am 6304d29b: (-s ours) 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 '6304d29b42ebf5e7b38fbdb94dd7c973d32ce89d':
2013-10-03 16:08:06 -07:00
Jean Chalard
9b6975e985 am fe2cadaf: 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 'fe2cadafecbca8733a5f728a8d588d1c993412f4':
2013-10-03 16:08:04 -07:00
Tadashi G. Takaoka
acfdcd0783 am 048b9be7: am ecff2e4b: am 36ba71fa: am f6a70ad5: am d3cf6715: am a6639636: Merge "Remove unnecessary @UsedForTesting annotation"
* commit '048b9be752dc180ad136826c5dafc8990cd6a323':
2013-10-03 16:08:01 -07:00
Jean Chalard
a386f9fe3c am e5a4442a: am edf9db69: am 50a3cfbf: am 5f05a1f3: am 2380f927: am 0013f97d: am 5906b05b: am 7058b02a: Extract a new class for app-specific workarounds.
* commit 'e5a4442a3b9b4f8a957042b0c7e4aba121ff27d9':
2013-10-03 16:07:58 -07:00
The Android Open Source Project
76319e9ad1 am 6a1e1b4c: (-s ours) 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 '6a1e1b4ccd3e69538a212efaf5ff1089d3aa54d4':
2013-10-03 16:07:56 -07:00
Kurt Partridge
b3f48fb16a am ed772e02: am 9ecf1b97: am 7d4c42af: am e348a313: am ec6e5d37: am de4e579c: Merge "Fix punctuation logging"
* commit 'ed772e02c3473f49e5d593384998a6c295b10e7f':
2013-10-03 16:07:53 -07:00
The Android Open Source Project
9edb2a35c4 am 0503ac42: (-s ours) 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 '0503ac4247e6e3ab61a12f7fdb99d3de66ec4025':
2013-10-03 16:07:51 -07:00
Kurt Partridge
106660ad7f am dd6592ef: am 502d0584: am 2d9093a1: am a9c36271: am f83050d9: am 17b63ba5: Merge "Remove unnecessary commit/uncommit"
* commit 'dd6592ef3e5eb0d0fec905eceb3e9b2e8a4d2294':
2013-10-03 16:07:49 -07:00
Kurt Partridge
fbbb2757cf am 883e1117: am 2c6d72d9: am 1ea4319b: am 77907a94: am 577bc298: am 7af5300c: Merge "Add claifying comment"
* commit '883e11179c4d3c963ad416ca86b30f423c3b5e51':
2013-10-03 16:07:46 -07:00
Jean Chalard
fa150a0c6c am d662a4b2: 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 'd662a4b2856519ca428d67cf7d3649cdbb3bb872':
2013-10-03 16:07:44 -07:00
Tadashi G. Takaoka
2cec1cd56b am d6ab843d: 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 'd6ab843da5edeb6f3bcaf61829592a1e83b6c722':
2013-10-03 16:07:42 -07:00
Tadashi G. Takaoka
f2bcf77420 am ab0f78bb: am 0b6aaf0b: am 0b9b70da: am 40a295dc: am 84828e15: am ad6df987: am d6a7a26d: am d59c1f83: am 50259c70: Merge "Tune layout parameters of setup wizard"
* commit 'ab0f78bba030e6782ad5aee59d9293b363c2b175':
2013-10-03 16:07:39 -07:00
Tadashi G. Takaoka
a04dafc6eb am 70420b71: am c430cb13: am 7ea5d079: am b3a6419d: am 9e990883: am feb169cb: am e7ef9669: am 7d9bd6f5: am 66b87269: Update welcome fallback image (using xhdpi asset)
* commit '70420b71003418381cbe8c87f1c3c96629083a33':
2013-10-03 16:07:37 -07:00
Tadashi G. Takaoka
4710bca3c4 am f33087a8: am ca01d5f2: am db6591a3: am d4af111f: am aa9d2ae3: am ce0273c2: am 883905f4: am 7fe67544: am 769427cf: Adjust aspect ratio of setup image
* commit 'f33087a8f38ac0a8347e8311e2a7524c8393960b':
2013-10-03 16:07:35 -07:00
The Android Automerger
61eca49469 am 89a457ec: 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 '89a457ec3d576247c00913f5319a2eb7afbc0aae':
2013-10-03 16:07:32 -07:00
Kurt Partridge
e6294b03e9 am 8f920423: am 3b341f8d: am b78340ba: am ccbb662e: am 6a923429: am ba4e480c: am 39afaf3d: am 6d0f0347: am b2d53be7: Merge "Remove FeedbackLog instance variables."
* commit '8f9204234556d02e4a7169a2a95081ef07fa519e':
2013-10-03 16:07:30 -07:00
Tadashi G. Takaoka
8e1975caab am 3ba0ce10: 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 '3ba0ce1042bfa21216d328144641f083e33ffef4':
2013-10-03 16:07:28 -07:00
Ken Wakasa
71f24d1d48 am ca25c610: 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 'ca25c6106ece4e527f317ba22747e0ec418c0da4':
2013-10-03 16:07:24 -07:00
Ken Wakasa
6e7bd849ea am feb308fe: am 0a672d86: am 1f413d84: am 784a961b: am 212798bf: am d8e8b007: am 5ee11c5d: am 2e0fc8bf: am d6d70e73: Merge "Revert "Fix isSuggestionsStripVisible when keyboard hidden""
* commit 'feb308fef6cac6421ab47a0e2a022560f3cd49b3':
2013-10-03 16:07:22 -07:00
Tadashi G. Takaoka
48ea9f00d1 am fb7ae63a: 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 'fb7ae63ad8cf5b2d624752fa911bb3b77a6e2062':
2013-10-03 16:07:19 -07:00
Tadashi G. Takaoka
85adf11de2 am 20dfc9e0: am 2ca3986c: am 5a240612: am bcccd22e: am 07ba843c: am 7ab91dfe: am 03f2ca6d: am f46eafe2: am c9398a3b: Merge "Fix PointerTrackerQueue.releaseAllPointerOlderThan"
* commit '20dfc9e0c50f598b43489a2218454e57fc009ccc':
2013-10-03 16:07:17 -07:00
Jean Chalard
99d1469cec am ec758d69: am 282d9bba: am 002039dd: am 00090e11: am 00d00767: am a1912d14: am 95586abc: am dccad3ef: am cb0d1c4c: Fix isSuggestionsStripVisible when keyboard hidden
* commit 'ec758d69a05efabd7c04102392fdb36e357834f1':
2013-10-03 16:07:16 -07:00
Baligh Uddin
ad952e0e63 am 1f0a9bd4: (-s ours) 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 '1f0a9bd469a9964469f70d07729e23bc09140c23':
2013-10-03 16:07:13 -07:00
Baligh Uddin
23cfda86d2 am e6f04426: (-s ours) 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 'e6f044262800c0a5b2b050980ea378c351300ea7':
2013-10-03 16:07:11 -07:00
Tadashi G. Takaoka
db0d225448 am ec517ec7: am d0648d66: am 8185b774: am 4e7c1637: am f6270ab2: am b76d1737: am 2d86b73f: am 035c68a1: am b121538e: Tune maximum keypress duration to 100 milliseconds
* commit 'ec517ec7fe8607fbc2163b9f423effe236038fbe':
2013-10-03 16:07:08 -07:00
Tadashi G. Takaoka
796613fddf am ec462f9f: 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 'ec462f9f4cf5d602e0b2267fdcac74534f47715a':
2013-10-03 16:07:06 -07:00
Tadashi G. Takaoka
75c92ad5ed am b31c6518: 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 'b31c6518f497060fe1b9b2580635569561ba47e0':
2013-10-03 16:07:03 -07:00
Tadashi G. Takaoka
efb67e07b9 am 8df36e6c: am 1ba88ee3: am 70912057: am 00204d85: am a0167db8: am 4103044a: am c731457f: am f6b5484d: am b5f67e7f: Add device specific keypress vibration duration database
* commit '8df36e6c3567bcdc8a22132901308405a255e678':
2013-10-03 16:07:00 -07:00
Tadashi G. Takaoka
19d78a049e am 0d2efd20: am c70c32a4: am 84627c43: am 484545c4: am db40c5d7: am 81fabdb8: am 73673b4c: am f1708394: am 0efd8d1b: Fix landscape override value expression
* commit '0d2efd20d863f40f4699943a278ab6ada24d83b5':
2013-10-03 16:06:57 -07:00
Tadashi G. Takaoka
100de3cd9b am e0a201be: 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 'e0a201be1377ce8a4bbfc4a1c9792e5c520fe856':
2013-10-03 16:06:55 -07:00
Tadashi G. Takaoka
604e2becee am 3ebbd86d: 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 '3ebbd86db5c4f554dc72a9bd3890e5a90867439c':
2013-10-03 16:06:52 -07:00
Tadashi G. Takaoka
52aa78baea am 294b2c17: am 4501c75b: am 1ace0735: am 7ff5db64: am 7c856e16: am cae4cd7b: am 66e5e05f: am 6780e43d: am 18184eac: Support regular expression for condition pattern
* commit '294b2c178ab189e020bc188bde8b57b886ab3bfb':
2013-10-03 16:06:50 -07:00
Tadashi G. Takaoka
234bcc7251 am aef8af97: am c8a5fe51: am 20d4751f: am a3ec57b3: am de1115a8: am 4c6fe8ed: am aaf7d70b: am 6f647842: am ec83457d: Merge "Support multiple condition for getDeviceOverrideValue"
* commit 'aef8af97d0bb1e4ee78a85b4be29de8d862c2210':
2013-10-03 16:06:47 -07:00
Ken Wakasa
0ab926e736 am 146acafc: am 184fc484: am 77d61817: am 451b6c3b: am 99effbc0: am 645b62fb: am 8738eeaf: am 01c133d7: am cb3bba3c: Rename GesturePreviewTrail.java -> GestureTrail.java
* commit '146acafc1b4799c4ab14eb06ebc3fbc2dff66ff1':
2013-10-03 16:06:45 -07:00
Kurt Partridge
28cfd8e28d am 0cc0e39b: am 0df768ab: am 54eb5bbb: am 1831d86e: am 772990b6: am 22fa8123: am 7bc99237: am 03a32146: am 7d72ca0b: Avoid JsonWriter multi-write error
* commit '0cc0e39b09ff01b12080fc60a824f7068b3ee6ca':
2013-10-03 16:06:43 -07:00
Kurt Partridge
ec14cded61 am 81dde43f: am 95d84f60: am cbbe8f2e: am ceedfcc5: am 1da572e1: am 7c2ca940: am 1e0f8cff: am 697f6abb: am 260df841: Merge "Remove unused code"
* commit '81dde43f6877667f2d5b3a09a2815d14245faac3':
2013-10-03 16:06:41 -07:00
Kurt Partridge
7c77298158 am de65abbd: am 011edb32: am 2d82e679: am 2325e858: am 5975a02e: am 28b9aec4: am eaf5c227: am 026b2645: am bb17034f: Merge "Remove ref to LatinImeLogger preference."
* commit 'de65abbd6da10eea33677c3ce7d4cba9a2ba1855':
2013-10-03 16:06:38 -07:00
Kurt Partridge
26e975a62c am 1a0556c3: am 3b601576: am c188bb61: am 548778d3: am 398e03ea: am 3ffe11a5: am 4ee6df8d: am 1f8b354c: am 4135c2db: Merge "Avoid NPE by fixing ResearchLogger initialization"
* commit '1a0556c3d9d4d7f10415f73f317e77691476f14c':
2013-10-03 16:06:36 -07:00
Tadashi G. Takaoka
33402c7546 am 710790b0: am 435ded26: am e17d367e: am 38a30fb0: am e3158e93: am aca3b625: am 941e8bba: am a01ab9ea: am 565ced45: Merge "Refactor StringUtils.findPrefixedString to findValueOfKey"
* commit '710790b00050fd8052d0e43cc424464d55a7dfc3':
2013-10-03 16:06:33 -07:00
Tadashi G. Takaoka
5ee347f70f am faabe9bf: am 53b0617e: am 7ae37424: am 9e533398: am 2ffe29b6: am 4b18d513: am e90fe9c3: am afc40e74: am 4705c0fa: Fix screen flash when launching settings activity
* commit 'faabe9bf0f67be3c22cef17e4ec535a4eb3aba3f':
2013-10-03 16:06:30 -07:00
Tadashi G. Takaoka
e848e1a46f am bafb5828: am 7184208a: am 575d06f5: am 5e0d0242: am dfd21666: am 82e697bf: am 05aa5e75: am 48002809: am 2b5c9726: Introduce another activity to launch setup wizard
* commit 'bafb58287b30fe9af69c636dc281b1c705d75e7c':
2013-10-03 16:06:27 -07:00
Tadashi G. Takaoka
506666385e am 18ad0562: 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 '18ad05625f5d6c0c41df638d9c3f82b9aae3f7d9':
2013-10-03 16:06:25 -07:00
Jean Chalard
3d6cdc34f9 am 76b08e5a: am dd512e68: am 86749e88: am 14a54c67: am b5feac06: am b2e4031e: am 28eab9d5: am 07905b6a: am 2564bd09: Merge "Reuse old preferences if possible."
* commit '76b08e5aeed91547828aa564bdcb74b2e8753396':
2013-10-03 16:06:23 -07:00
Satoshi Kataoka
763140c950 am b912a401: 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 'b912a40175492d2c5068c82b885d0d4ec9996405':
2013-10-03 16:06:20 -07:00
Tadashi G. Takaoka
82f32e6e92 am 0740e038: am 091210b5: am 206eebbd: am 81b92a35: am 78296e91: am aab8a18b: am 1cb72a09: am 384d4e5b: am 2ad7023c: Fix detecting out of keyboard area
* commit '0740e03888521c433eb64fd4061bbe839d38970b':
2013-10-03 16:06:17 -07:00
Baligh Uddin
eae3e7e23e am 2a0bb1b5: (-s ours) am 18b361fd: (-s ours) am 0998f0d5: (-s ours) am 80698db1: (-s ours) am da09228f: (-s ours) am e31e4a9c: (-s ours) am ad12dfa6: (-s ours) am dfc0adfe: am b0aabbfb: (-s ours) am 8dafc8e8: (-s ours) am 22e6a5c5: Import translations. DO NOT MERGE
* commit '2a0bb1b51c00e7e8fab745b960db59198dd7b6a9':
2013-10-03 16:06:16 -07:00