Commit graph

21601 commits

Author SHA1 Message Date
Satoshi Kataoka
2e7f74f00c am 615509cf: am 9d763910: Merge "Unfortunately, hide some broken "emoji"s"
* commit '615509cf27839e946280787cf27d8c091079b91b':
  Unfortunately, hide some broken "emoji"s
2013-10-09 17:54:01 -07:00
Jean Chalard
e398d09a50 am af75e48e: am 74577bed: Merge "Implement the heuristic for auto-commit."
* commit 'af75e48efdc5be7d0b1c3d411017757454ed1799':
  Implement the heuristic for auto-commit.
2013-10-09 17:53:58 -07:00
Jean Chalard
1f8eab7d79 am a6e7c3ff: am ff9476f1: Merge "Fix typos"
* commit 'a6e7c3ff29c2b9eaf406f96dd3ee44cafa293452':
  Fix typos
2013-10-09 17:53:55 -07:00
Jean Chalard
805bae9575 am 6f2830dc: am 2afa0e62: Merge "Fix a bug where gesture would delay update."
* commit '6f2830dcb91fd2d00088c7522c91a45e90a1f3e6':
  Fix a bug where gesture would delay update.
2013-10-09 17:53:52 -07:00
Ken Wakasa
3dd8185656 am a9f5c55c: am 382094a7: Merge "Cleanup and remove redundant more keys on phones"
* commit 'a9f5c55ca2f075ed6923e0040fa66c07a5a37176':
  Cleanup and remove redundant more keys on phones
2013-10-09 17:53:49 -07:00
Ken Wakasa
272a8b79d8 am 88c946af: am 194c6360: Merge "Swap keys: exclamation, question, period, comma."
* commit '88c946af0c8a8e07092be71a7b98957d021e499b':
  Swap keys: exclamation, question, period, comma.
2013-10-09 17:53:47 -07:00
Keisuke Kuroyanagi
d5ff552c9e am a231c2ab: am e89a179b: Merge "Separate "GC" and "GC with decay"."
* commit 'a231c2ab72e92a3f849c347bc46d3f8599547510':
  Separate "GC" and "GC with decay".
2013-10-09 17:53:44 -07:00
Ken Wakasa
b04568b460 am 1522e7be: am cc81a93b: Merge "Add skipPtNode to DictDecoders."
* commit '1522e7be20ac53c3870d493e3a9fb7946edbbea4':
  Add skipPtNode to DictDecoders.
2013-10-09 17:53:41 -07:00
Satoshi Kataoka
acdd67bb42 am 98da7cfc: am c2dda795: Tentatively revert inconsistent assets
* commit '98da7cfc0b9afc75db240d10c20f3360fe693320':
  Tentatively revert inconsistent assets
2013-10-09 17:53:39 -07:00
Satoshi Kataoka
8498002afb am db083a2b: am a4913994: Hide indication bar if only one page
* commit 'db083a2b25d057f21a22333251ea0a78668e6326':
  Hide indication bar if only one page
2013-10-09 17:53:37 -07:00
Keisuke Kuroyanagi
07fe099765 am d00e4865: am 126d758c: Merge "Quit blocking getSuggestion during GC."
* commit 'd00e48656b02ff49fc834ed6762dc194d00b42ad':
  Quit blocking getSuggestion during GC.
2013-10-09 17:53:34 -07:00
Jean Chalard
645d992786 am bff2d14d: am 74730a46: Merge "Create the wiring for auto-commit confidence computation."
* commit 'bff2d14d1caf4d70f8c1fdcbbf8e9b41209a3e94':
  Create the wiring for auto-commit confidence computation.
2013-10-09 17:53:32 -07:00
Ed Heyl
d8d2a9fca7 am 02092936: merge in KQS81M
* commit '02092936b982f8ca64ccb1a02d7aefd44e0e4a94':
  Import translations. DO NOT MERGE
2013-10-08 15:47:52 -07:00
Ed Heyl
02092936b9 merge in KQS81M 2013-10-08 15:43:27 -07:00
Baligh Uddin
0de11871c5 am b2ffcd64: (-s ours) Import translations. DO NOT MERGE
* commit 'b2ffcd6424eaed951302889079773f6a51c9d380':
  Import translations. DO NOT MERGE
2013-10-06 18:11:59 -07:00
Baligh Uddin
b2ffcd6424 Import translations. DO NOT MERGE
Change-Id: I6f88694633aa9f39c6b1731ea7634b80d3e3bf69
Auto-generated-cl: translation import
2013-10-04 22:55:10 -07:00
Qiwen Zhao
551a1c246f reset to klp-dev branch to fix merging problem. 2013-10-04 11:04:56 -07:00
Satoshi Kataoka
d03f17936b am f4aa9a7b: Do not merge. Revert emoji key position to JB-mr2
* commit 'f4aa9a7bd71b646cee8dd7dd19af27bc56238d1e':
  Do not merge. Revert emoji key position to JB-mr2
2013-10-04 00:47:41 -07:00
Satoshi Kataoka
f4aa9a7bd7 Do not merge. Revert emoji key position to JB-mr2
Cherry pick of Ie2033b2f5253b2e2

Bug: 10954182
Change-Id: I9cc61e27a207055d5a43fe3da6fd1ec63bae49fd
2013-10-04 16:38:54 +09:00
Kurt Partridge
f90a5925c7 am 27a9d47e: am 3c5a3eb7: am 85ce6eda: am 6f2e6cee: am fc924f81: am 6deb9021: am df8f0fb6: Merge "Fix layout"
* commit '27a9d47efe3ed3b1ad852717595be3f796e6c49a':
2013-10-03 17:01:59 -07:00
Kurt Partridge
21af73e494 am 653998df: am 742b119b: am 57db1d77: am e181a5d6: am 19750ab9: am e1f86359: am c4fe2942: Merge "Fix misplaced xml namespace"
* commit '653998dff91e2b29150de2915dea074874fecbba':
2013-10-03 17:01:48 -07:00
Kurt Partridge
6d5a3402f4 am b1f444c7: am cf60b2ac: am b853d2fb: am e27429e8: am aceaaedd: am a0542472: am 264fb958: Merge "Log reasons for punting n-gram logging"
* commit 'b1f444c72117f675b0e32bc5dde785c8d4f50fd2':
2013-10-03 17:01:44 -07:00
Tadashi G. Takaoka
bc5f7f72b6 am 222b26e7: am f5db355e: am a3282d2b: am 29ce1bc4: am 47218496: am 4e41750d: am 4187499c: Merge "Remove unnecessary methods of KeyboardSwitcher"
* commit '222b26e7d2ef35b7956390ef4472c8ce8e70b563':
2013-10-03 17:01:41 -07:00
Tadashi G. Takaoka
2021f3935a am f8ba9d8d: am b841ba2b: am d2351fd8: am 4022aef4: am 3a022999: am 5075d07d: am f6797a5e: Fix missing import
* commit 'f8ba9d8dbf03757c16d7f6e3e766afec2eb84272':
2013-10-03 17:01:37 -07:00
Tadashi G. Takaoka
9ed9f4155c am 5ec51af2: am 7a89fa66: am 7565cede: am 31b5abf6: am 71e5b9dc: am 37c2f94b: am dc22b722: Merge "Clean up unused return value"
* commit '5ec51af222c11deeed9e1c079187272bea3f14df':
2013-10-03 17:01:34 -07:00
Tadashi G. Takaoka
a31edc6857 am 2a41c397: am aec3d618: am 21988825: am 1f0af7d4: am d19c84ff: am a1f4af50: am d8835326: Merge "Haptick and audio feedback on key repeat"
* commit '2a41c397a46a429082bbce1ccf07262c88ffa0f1':
2013-10-03 17:01:30 -07:00
Kurt Partridge
ad1d55f9df am d1fb89b8: am 070bac6e: am c4658407: am 7351ad8d: am 8b37abda: am 75b75d8b: am 5fdea477: Merge "Always record word boundaries"
* commit 'd1fb89b83fe4cebe41593ced93b0120e893a4f8d':
2013-10-03 17:01:25 -07:00
Tadashi G. Takaoka
b5a7d5b19b am 25ba9649: am 3ccbd5a6: am e155ae60: am 13dd760b: am 1e0af2e5: am 48346c47: am d9a87eb8: Merge "Fix drawing debug points of gesture trails"
* commit '25ba964925e40479ceee77a6d928030d1e8cdcc7':
2013-10-03 17:01:22 -07:00
Keisuke Kuroyanagi
105340bd81 am fc4f011e: am e1f7d93f: am d80e51b8: am a4d9d47d: am 3c6388ef: am ea6a59ff: am 44f679bb: Merge "Fix running on device regression test and profile."
* commit 'fc4f011e9f4c93ba9d61f4b790bad5aceb053183':
2013-10-03 17:01:17 -07:00
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