Commit graph

23341 commits

Author SHA1 Message Date
Tadashi G. Takaoka
2164b4f236 am 3d457bb0: am 6f4405f6: am 68ad73d0: am ba626004: am fe16b5ab: am 418f8753: am 8a6a15e0: Merge "Clean up IntentCompatUtils a bit"
* commit '3d457bb0477cd82ae81f9f18e52e57103711b2ad':
2013-10-03 17:01:13 -07:00
Kurt Partridge
6a37c3c69b am 895f5af5: am 78ca4681: am b4231951: am af15c959: am c8d50d47: am e3a72c9b: am ff80ee20: Merge "Modify isAllowedToLog"
* commit '895f5af55acfe76eeae85f4604a5519e3cba256e':
2013-10-03 17:01:10 -07:00
The Android Open Source Project
b26794d4dd am ac96dac7: (-s ours) 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 'ac96dac76b1ad5ddfa44220ec45dbed56212f624':
2013-10-03 17:01:06 -07:00
Jean Chalard
2487719365 am 50261d5c: 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 '50261d5c45085fd18b4f12f88e219b9e843741ad':
2013-10-03 17:01:03 -07:00
Baligh Uddin
ee855f42ac am 0c8f3292: (-s ours) 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 '0c8f3292e7f5c0a524e5032e41d2bd1e7e3c5ddf':
2013-10-03 17:01:00 -07:00
Baligh Uddin
42fb025c31 am 5b59a52b: (-s ours) 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 '5b59a52bfef3ba5c27db6af11ac5134093c7a4f2':
2013-10-03 17:00:57 -07:00
Baligh Uddin
07b8464661 am 50f28828: (-s ours) 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 '50f288285e278f684edbf99e63e2b02607013516':
2013-10-03 17:00:53 -07:00
Jean Chalard
5303139bb3 am 9b6975e9: 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 '9b6975e985d02570c022a5ffdf9d825a08fb88aa':
2013-10-03 17:00:50 -07:00
Tadashi G. Takaoka
06a31bbfc9 am acfdcd07: am 048b9be7: am ecff2e4b: am 36ba71fa: am f6a70ad5: am d3cf6715: am a6639636: Merge "Remove unnecessary @UsedForTesting annotation"
* commit 'acfdcd078362a32fd22355728ea89f303c9ed137':
2013-10-03 17:00:47 -07:00
Jean Chalard
4e3da8d332 am a386f9fe: 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 'a386f9fe3c0457fa97317b807b92bed9017a8cb4':
2013-10-03 17:00:43 -07:00
The Android Open Source Project
f3a4b32022 am 76319e9a: (-s ours) 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 '76319e9ad122c00f779bfff0e576ed1a130d05cb':
2013-10-03 17:00:39 -07:00
Kurt Partridge
638ff4583f am b3f48fb1: am ed772e02: am 9ecf1b97: am 7d4c42af: am e348a313: am ec6e5d37: am de4e579c: Merge "Fix punctuation logging"
* commit 'b3f48fb16a7db400196fc6e74b965e5585d9c7f0':
2013-10-03 17:00:35 -07:00
The Android Open Source Project
ed60c5f33c am 9edb2a35: (-s ours) 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 '9edb2a35c430168cabaa1c9ad48c8a6f315d8fa5':
2013-10-03 17:00:32 -07:00
Kurt Partridge
9c11b9b7ad am 106660ad: am dd6592ef: am 502d0584: am 2d9093a1: am a9c36271: am f83050d9: am 17b63ba5: Merge "Remove unnecessary commit/uncommit"
* commit '106660ad7fedea898889b9c313ecf7072630b616':
2013-10-03 17:00:26 -07:00
Kurt Partridge
b253f76ec4 am fbbb2757: am 883e1117: am 2c6d72d9: am 1ea4319b: am 77907a94: am 577bc298: am 7af5300c: Merge "Add claifying comment"
* commit 'fbbb2757cff8f42f91426b6790242249b5293284':
2013-10-03 17:00:22 -07:00
Jean Chalard
5b7ace5a29 am fa150a0c: 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 'fa150a0c6caf0078a5ac9a262a48f759166d4ab4':
2013-10-03 17:00:18 -07:00
Tadashi G. Takaoka
a06e1810cb am 2cec1cd5: 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 '2cec1cd56bc7b49c76c59468c4e1dc1ef91e1a39':
2013-10-03 17:00:13 -07:00
Tadashi G. Takaoka
c0a8f2b401 am f2bcf774: 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 'f2bcf77420022e2c5c764541cd79ab1877bc7646':
2013-10-03 17:00:10 -07:00
Tadashi G. Takaoka
80132f1f97 am a04dafc6: 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 'a04dafc6ebcd6bfd1f069367b7e925a8de7511e6':
2013-10-03 16:56:27 -07:00
Tadashi G. Takaoka
110f38b917 am 4710bca3: 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 '4710bca3c49399492ece621346a06ee4be43711d':
2013-10-03 16:56:24 -07:00
The Android Automerger
8ec81d31ae am 61eca494: 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 '61eca49469667c83efc9653866ce24eec9c8ee62':
2013-10-03 16:56:21 -07:00
Kurt Partridge
307749b2b0 am e6294b03: am 8f920423: am 3b341f8d: am b78340ba: am ccbb662e: am 6a923429: am ba4e480c: am 39afaf3d: am 6d0f0347: am b2d53be7: Merge "Remove FeedbackLog instance variables."
* commit 'e6294b03e9fe6819fadd9d4c0f068503dbea9e48':
2013-10-03 16:56:18 -07:00
Tadashi G. Takaoka
73d7ee1b2c am 8e1975ca: 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 '8e1975caabef830e5e1df1fdf0a67874720b4e8f':
2013-10-03 16:56:15 -07:00
Ken Wakasa
f7852136d8 am 71f24d1d: 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 '71f24d1d48f40cc4cbd37aa6667086acb63208d6':
2013-10-03 16:56:12 -07:00
Ken Wakasa
9dab0b2ec6 am 6e7bd849: 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 '6e7bd849ea8e799a1c75e8c7a2dc6acd8448077d':
2013-10-03 16:56:05 -07:00
Tadashi G. Takaoka
8834818c7a am 48ea9f00: 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 '48ea9f00d1af67f4390a97a93e2595675daa8611':
2013-10-03 16:56:00 -07:00
Tadashi G. Takaoka
f98d8a529d am 85adf11d: am 20dfc9e0: am 2ca3986c: am 5a240612: am bcccd22e: am 07ba843c: am 7ab91dfe: am 03f2ca6d: am f46eafe2: am c9398a3b: Merge "Fix PointerTrackerQueue.releaseAllPointerOlderThan"
* commit '85adf11de2a89bf5315d236bf15e9bc2a567e025':
2013-10-03 16:55:57 -07:00
Jean Chalard
fd10726135 am 99d1469c: am ec758d69: am 282d9bba: am 002039dd: am 00090e11: am 00d00767: am a1912d14: am 95586abc: am dccad3ef: am cb0d1c4c: Fix isSuggestionsStripVisible when keyboard hidden
* commit '99d1469cec20949d61bf8c63d8da52a68208a5cf':
2013-10-03 16:55:51 -07:00
Baligh Uddin
458fcc2013 am ad952e0e: (-s ours) 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 'ad952e0e633fe49419bc3c4f3cd0ba8c687f215f':
2013-10-03 16:55:49 -07:00
Baligh Uddin
069abe758d am 23cfda86: (-s ours) 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 '23cfda86d22bda64e2929993903cd9e6f9a2ffcd':
2013-10-03 16:55:43 -07:00
Tadashi G. Takaoka
02d1280930 am db0d2254: 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 'db0d2254487ebe97a99561704a0d9307745d5aaa':
2013-10-03 16:55:40 -07:00
Tadashi G. Takaoka
5312bbe023 am 796613fd: 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 '796613fddf7dff77770c3ce3fc039287304418e4':
2013-10-03 16:55:37 -07:00
Tadashi G. Takaoka
7904ab0809 am 75c92ad5: 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 '75c92ad5edc3144ab992a24ab6943ef6414df347':
2013-10-03 16:55:33 -07:00
Tadashi G. Takaoka
61956467ba am efb67e07: 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 'efb67e07b93ef13535b4e85ac75d39196e6a99a2':
2013-10-03 16:55:30 -07:00
Tadashi G. Takaoka
b78fcc4811 am 19d78a04: am 0d2efd20: am c70c32a4: am 84627c43: am 484545c4: am db40c5d7: am 81fabdb8: am 73673b4c: am f1708394: am 0efd8d1b: Fix landscape override value expression
* commit '19d78a049ef2f6de45cccf564cc84c31febf4afb':
2013-10-03 16:55:26 -07:00
Tadashi G. Takaoka
bb0776cf20 am 100de3cd: 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 '100de3cd9b5b42300bd2c92640ac33a3554ee2d9':
2013-10-03 16:55:23 -07:00
Tadashi G. Takaoka
cc048ae7ee am 604e2bec: 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 '604e2becee4f1d16bcdbb96a16cd6ebab42c6bb7':
2013-10-03 16:55:20 -07:00
Tadashi G. Takaoka
9e775acfe1 am 52aa78ba: 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 '52aa78baea0624f040703e211343880d97f32493':
2013-10-03 16:55:17 -07:00
Tadashi G. Takaoka
2a968cfcbe am 234bcc72: 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 '234bcc7251c6164456d9383f68925cd816d04d7f':
2013-10-03 16:55:13 -07:00
Ken Wakasa
e4e60ed691 am 0ab926e7: am 146acafc: am 184fc484: am 77d61817: am 451b6c3b: am 99effbc0: am 645b62fb: am 8738eeaf: am 01c133d7: am cb3bba3c: Rename GesturePreviewTrail.java -> GestureTrail.java
* commit '0ab926e7365b9c89ba4f2b67fbcaffe20354946e':
2013-10-03 16:55:10 -07:00
Kurt Partridge
d2a54da723 am 28cfd8e2: am 0cc0e39b: am 0df768ab: am 54eb5bbb: am 1831d86e: am 772990b6: am 22fa8123: am 7bc99237: am 03a32146: am 7d72ca0b: Avoid JsonWriter multi-write error
* commit '28cfd8e28df038fc9643361cf10108ff063a856f':
2013-10-03 16:55:07 -07:00
Kurt Partridge
3c61c0b9e5 am ec14cded: am 81dde43f: am 95d84f60: am cbbe8f2e: am ceedfcc5: am 1da572e1: am 7c2ca940: am 1e0f8cff: am 697f6abb: am 260df841: Merge "Remove unused code"
* commit 'ec14cded6176f9c4aded9fc54acf65a7536914b8':
2013-10-03 16:55:04 -07:00
Kurt Partridge
45fae2b282 am 7c772981: 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 '7c7729815869fd4e97c41c6d3123c6bdecf2f525':
2013-10-03 16:55:01 -07:00
Kurt Partridge
a561bc7048 am 26e975a6: 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 '26e975a62c3481e4bf71fb7c497cce6305126d51':
2013-10-03 16:54:58 -07:00
Tadashi G. Takaoka
d61c92b4b4 am 33402c75: 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 '33402c7546d1eb15addfe0abba3642d4814ccd2e':
2013-10-03 16:54:55 -07:00
Tadashi G. Takaoka
af699e3a90 am 5ee347f7: 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 '5ee347f70f02c3c7c4bacdbe087a4b59e2dc2cbf':
2013-10-03 16:54:52 -07:00
Tadashi G. Takaoka
9abce57efa am e848e1a4: 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 'e848e1a46fcf2d7ab7275f652320f2793eb01a7f':
2013-10-03 16:54:48 -07:00
Tadashi G. Takaoka
e05c7d4d9e am 50666638: 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 '506666385eda0ea86138b164288e2b1f6aeb3154':
2013-10-03 16:54:45 -07:00
Jean Chalard
9f27c64243 am 3d6cdc34: 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 '3d6cdc34f9bae02e7d7ff263ebc0c440455f3835':
2013-10-03 16:54:42 -07:00
Satoshi Kataoka
c917fd4eba am 763140c9: 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 '763140c950a104f2ba3968bd42650f4ed7acd045':
2013-10-03 16:54:38 -07:00