The Android Open Source Project
|
37f22676b0
|
am b241b243: am 740243cb: (-s ours) am cf0c1a7d: am 19289df5: am e279de02: (-s ours) am ab6fa041: am e72a088f: am a6dcb55e: (-s ours) am 62adeccd: am 577f08a3: am 22384b57: (-s ours) am 0ed901ff: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit 'b241b243c893810461dd6da004e323dcea386d38':
|
2013-05-15 10:37:40 -07:00 |
|
The Android Open Source Project
|
3f0311128a
|
am 3675b5bb: am 1996320a: (-s ours) am faa9a5ec: am d9f9ba39: am 4b176a01: (-s ours) am 83346295: am 2c7b1b82: am d2582473: (-s ours) am 22953740: Reconcile with jb-mr2-release - do not merge
* commit '3675b5bb967ec9683f5fc7cdbb61a9e87c3cd3c8':
|
2013-05-15 10:37:38 -07:00 |
|
Baligh Uddin
|
d28727d92b
|
am 480ebe79: am 403354ba: (-s ours) am bc5075e0: am 536ec3bf: am b4fbb295: (-s ours) am d3ae58ef: am 3bc22c56: am e7d91194: (-s ours) am 370070ae: am 4cdb7ccb: Import translations. DO NOT MERGE
* commit '480ebe7969ac6d9c19d1c6489128ddc7a93802b6':
|
2013-05-15 10:37:36 -07:00 |
|
Baligh Uddin
|
d31b88ab17
|
am 7c9a29d5: am 2c71e826: (-s ours) am 4d5ebdf5: am f420e3bf: am 792abb73: (-s ours) am 3c163ec1: am ac68b5ce: am 4b8494c4: (-s ours) Import translations. DO NOT MERGE
* commit '7c9a29d578fe2651620733fe9036485c2c292430':
|
2013-05-15 10:37:34 -07:00 |
|
Baligh Uddin
|
097dee9d42
|
am dd3aa373: am 9f2573e4: (-s ours) am ea0d7ecd: am 82c49d74: am c1f3a801: (-s ours) am 8acb56b6: am 128ab7e5: Import translations. DO NOT MERGE
* commit 'dd3aa3732131a17defff7b27220bd11b294d283b':
|
2013-05-15 10:37:32 -07:00 |
|
Satoshi Kataoka
|
659774af10
|
am 24c86a66: am 4c767c81: am b2230d90: am 62f52e4f: am a514e958: am a2b129e9: am 0b0d9827: am 95fe8267: Move suggest logic to AOSP
* commit '24c86a666d832416f36f16de912e465f67c62c72':
|
2013-05-15 10:37:30 -07:00 |
|
Jean-Baptiste Queru
|
d535416e62
|
am 68dcdeed: am 6e5857cb: (-s ours) am 67953e4d: am 626dd2a0: am 784eda74: (-s ours) am d9f35e32: am a21bec13: am 30667266: (-s ours) am 5bcb3876: Merge 2caa1d81ce - do not merge
* commit '68dcdeed72c9c2c5273bd488eff830fc2feec839':
|
2013-05-15 10:37:28 -07:00 |
|
Kurt Partridge
|
e64ec6e1ac
|
am fb4da969: am 89ccc962: am 9cf39372: am 94c441a4: am cdaee868: Merge "Preserve a class for testing"
* commit 'fb4da9692bfa749d245d9e558800ee6d573af230':
|
2013-05-15 10:37:26 -07:00 |
|
Tom Ouyang
|
607c566cde
|
am bcefab0c: am 44eabffc: am e9de986d: am f08c75f2: am fd9f3d97: Add ability to handle digraphs in gesture and tap typing
* commit 'bcefab0cb94c1c2ca17a2dc4a231e4c12f09696a':
|
2013-05-15 10:37:24 -07:00 |
|
Tom Ouyang
|
94e209c5df
|
am 0fe18452: am 0de0fa3b: am 0ca76c94: am 38a9e5a5: am b6e1777d: Merge "Add mechanism to handle digraphs in DicNode"
* commit '0fe18452df5e666d568ba0dd7b4b050b09d0e9a9':
|
2013-05-15 10:37:22 -07:00 |
|
Kurt Partridge
|
07cc9c0793
|
am d40d2f35: am eba670d0: am 6267ec68: am 3e1f652c: am 099dd3f2: Merge "Better release build reporting"
* commit 'd40d2f3536eb50d8e5d5d6e7378fb2283b438aad':
|
2013-05-15 10:37:20 -07:00 |
|
Baligh Uddin
|
98fa49d5e0
|
am 265eed2b: am 7c0257ae: (-s ours) am 60ffda41: am 5bbf4f30: am cc42e139: (-s ours) Import translations. DO NOT MERGE
* commit '265eed2bca109f47ef704c9c10465e449a4ad77d':
|
2013-05-15 10:37:18 -07:00 |
|
Baligh Uddin
|
879d9c284d
|
am 93e873cf: am b155cedc: (-s ours) am 855b8053: am d86e14ae: Import translations. DO NOT MERGE
* commit '93e873cf715e21f7dfb3821f05dd86dbed8cab46':
|
2013-05-15 10:37:16 -07:00 |
|
Jean Chalard
|
cbecd375a9
|
am 56e03dd3: am 9129c0d1: am 7503ef33: am cd51b80a: am fb3e8057: Merge "Fix a bug where a space would not be inserted before a gesture"
* commit '56e03dd3517ae8cb5d39cb85f6feb477d6311f0f':
|
2013-05-15 10:37:14 -07:00 |
|
Tadashi G. Takaoka
|
8d38f57449
|
am 7d4f0961: am ef2d1555: am c627f642: am 9a6ff5dc: am c7d41589: Merge "Use private object as a lock instead of synchronized method"
* commit '7d4f0961d4078d5baada0b3a22205f8b786fd516':
|
2013-05-15 10:37:12 -07:00 |
|
Tadashi G. Takaoka
|
6fe0a646f3
|
am 38af721f: am 44905316: am 45163044: am 1502d977: am 12e77de2: Merge "Use private lock object instead of synchronized method"
* commit '38af721f108c4b409efa6f373c46baeb6b15ff0d':
|
2013-05-15 10:37:10 -07:00 |
|
Tadashi G. Takaoka
|
869aebcc34
|
am 45a1fbd4: am 70a79ee6: am 8ea774eb: am 14950497: am 1e256f58: Merge "Protect simultaneously modifying gesture preview data"
* commit '45a1fbd488c30c71c8d7e3d18df09db6f43e0c3c':
|
2013-05-15 10:37:08 -07:00 |
|
Jean Chalard
|
4168d0b502
|
am 1792b892: am f514024a: am 818b7d46: am 80d7ed0b: am 4f430763: Fix a faulty test
* commit '1792b8925f287fca9da24527c08e61ca9c98018d':
|
2013-05-15 10:37:06 -07:00 |
|
Jean Chalard
|
e40d883f99
|
am 0cfbc7c6: am 8e7e9df1: am 99e91fc8: am 2dd2e2d7: am 99b93d17: Fix a bug where autocorrection status would be wrong.
* commit '0cfbc7c67c48ad4691f609db7b2969e8c4a1d809':
|
2013-05-15 10:37:04 -07:00 |
|
Tadashi G. Takaoka
|
6de62a6be6
|
am b3f31ea6: am 21dd8537: am 9a0f6ef8: am c35bca68: am 262d5bd9: Don\'t override EXTRA_SHOW_FRAGMENT if exists
* commit 'b3f31ea66ab656c79560e608de909b07755b3e5f':
|
2013-05-15 10:37:03 -07:00 |
|
Tadashi G. Takaoka
|
85ee1317e4
|
am 367fe0c3: am f8a1317f: am f0a4508a: am f5aa2fd5: am 10af4b6e: Merge "Separate StringUtils.capitalizeFirstCharacter"
* commit '367fe0c31389c5cc764de4d1a2448ec5fce52e75':
|
2013-05-15 10:37:01 -07:00 |
|
Keisuke Kuroynagi
|
f610ea3053
|
am e3997340: am cde21724: am 5c7c36e3: am e81c1678: am 87fdde6e: Typing double letters via a \'circle\' on the key.
* commit 'e399734095060758aac9d3ae4586617c711f8bcd':
|
2013-05-15 10:36:59 -07:00 |
|
Tadashi G. Takaoka
|
ea5018912e
|
am eea5453c: am 86726e21: am 6f6edd76: am ae8a941e: am f606fd85: Hide Setup Wizard icon for stock keyboard
* commit 'eea5453c45461b36e84e9280445a5295edffe65b':
|
2013-05-15 10:36:57 -07:00 |
|
Tadashi G. Takaoka
|
c98d43702c
|
am 336bfb2f: am a51ddebb: am 0d9164ec: am 0d7499bc: am 4fdfce6d: Merge "Refactor SpellCheckerProximityInfo as extending ProximityInfo"
* commit '336bfb2f69658292d2991e3851204277d947948a':
|
2013-05-15 10:36:55 -07:00 |
|
Tom Ouyang
|
9de571ffca
|
am 1711cee0: am 20d54cab: am 6a0f11cc: am ff981cc3: am 43779c04: Merge "Add method to get dictionary flags from DicTraverseSession"
* commit '1711cee04917a8c56353e21839eab494dbcd4710':
|
2013-05-15 10:36:53 -07:00 |
|
Baligh Uddin
|
680b09d3f3
|
am f96989dd: am fe4c83c6: (-s ours) am 1646267f: am 8e7ca6be: am 224e969e: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit 'f96989dd631568b2e2353cf3b980d6a4b77e1953':
|
2013-05-15 10:36:52 -07:00 |
|
Baligh Uddin
|
29faddc4d2
|
am 0063ed45: am 79dcc4f0: (-s ours) am 2eede9f4: am 13811400: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
* commit '0063ed45de22d87c3b2628e8cfc0b05b38a7f5ba':
|
2013-05-15 10:36:50 -07:00 |
|
Kurt Partridge
|
cb121fa81a
|
am 24ba5149: am 436008fe: am d3497938: am ab8f166e: am 09ab6495: Merge "[FileEncap18] Clean up uploading scheduling"
* commit '24ba5149f08223eba05552c4d62e438304f8d72c':
|
2013-05-15 10:36:48 -07:00 |
|
Kurt Partridge
|
b1767bc433
|
am 40070707: am 7a172175: Merge "Fix user recording dialog"
* commit '40070707d83fb2a105292a0683fa22a1094e58fe':
Fix user recording dialog
|
2013-05-15 10:36:46 -07:00 |
|
Kurt Partridge
|
5abe65f1da
|
am 72ca59bc: am 0833b3cb: Merge "Fix alarm bug"
* commit '72ca59bc2a29eaadf0b557995a137c8f682d82bb':
Fix alarm bug
|
2013-05-15 10:36:44 -07:00 |
|
Kurt Partridge
|
453b371d2f
|
am 1019c630: am a1913301: Merge "Avoid duplicate MotionEvents"
* commit '1019c630fafd4bffd3fb51a0b83dfc532dcd5306':
Avoid duplicate MotionEvents
|
2013-05-15 10:36:42 -07:00 |
|
Kurt Partridge
|
10270196c8
|
am a2a29050: am b903f103: Merge "Label logUnits after LatinImeOnEndBatchInput"
* commit 'a2a2905033d37784b84191eec8d1efa3cd5b4819':
Label logUnits after LatinImeOnEndBatchInput
|
2013-05-15 10:36:39 -07:00 |
|
Kurt Partridge
|
86b2c57c47
|
am f5864fbb: am a5bfac5b: Merge "Fix NPE"
* commit 'f5864fbb7a8703cb44a6e7bd77d7031ee271db12':
Fix NPE
|
2013-05-15 10:36:37 -07:00 |
|
Kurt Partridge
|
79cd791b72
|
am f9c137aa: am 7da87f97: Merge "Clean up unnecessary log messages"
* commit 'f9c137aa600aa804110437a9385de8b5338a28b8':
Clean up unnecessary log messages
|
2013-05-15 10:36:30 -07:00 |
|
Kurt Partridge
|
22c706aa36
|
am a9c2ff1b: am e9e4fe52: Merge "Fix logic error"
* commit 'a9c2ff1b236624e7aefeecb2dbd2829e8217130c':
Fix logic error
|
2013-05-15 10:36:26 -07:00 |
|
Kurt Partridge
|
4a885f254d
|
am b20c7ee7: am 1f99e04b: Merge "Fix JsonWriter bug"
* commit 'b20c7ee75093ae9c111daf64d9e4f8509d692824':
Fix JsonWriter bug
|
2013-05-15 10:36:24 -07:00 |
|
Kurt Partridge
|
80a6848d8a
|
am 6c80e047: am dac3ee49: Merge "Small dot in corner was not visible"
* commit '6c80e0475c8cde60fbadb9bab892a74dfa60132a':
Small dot in corner was not visible
|
2013-05-15 10:36:22 -07:00 |
|
Kurt Partridge
|
21a2cfca20
|
am abc8d564: am dd8c87a3: Merge "Include nanoTime in filename"
* commit 'abc8d564eb0674887b5b1ebae3c1029935f4bb7b':
Include nanoTime in filename
|
2013-05-15 10:36:20 -07:00 |
|
Tadashi G. Takaoka
|
0474d725b4
|
am e85e3c64: am 46420204: Add user feedback to setup action labels and icons
* commit 'e85e3c64767552461debc0b1989f09033f7e3054':
Add user feedback to setup action labels and icons
|
2013-05-15 10:36:18 -07:00 |
|
Tadashi G. Takaoka
|
76cc6abc3a
|
am 0206339a: am 47a78aeb: Merge "Finalize setup wizard strings and mark as translatable"
* commit '0206339a2664d1cb05fff3ff20352cf04871bef1':
Finalize setup wizard strings and mark as translatable
|
2013-05-15 10:36:16 -07:00 |
|
Tadashi G. Takaoka
|
1626830701
|
am bb84fdd1: am bb5deb82: Fix singleton/utility classes initialization in SettingsFragment
* commit 'bb84fdd134e0a5aff268d5d475091e023778655d':
Fix singleton/utility classes initialization in SettingsFragment
|
2013-05-15 10:36:14 -07:00 |
|
Tadashi G. Takaoka
|
6dd2130d84
|
am 2101ba41: am 888a194c: Fix missing AudioAndHapticFeedbackManager initialization
* commit '2101ba410c4fd12919b3b84e4e6bcc61b1897e70':
Fix missing AudioAndHapticFeedbackManager initialization
|
2013-05-15 10:36:12 -07:00 |
|
Tadashi G. Takaoka
|
e4bd4c4465
|
am cc8733ef: am edc49d38: Fix bug to update last interpolated index of GestureStroke
* commit 'cc8733ef71ddd369dbd48ac1b7336fb42af813e6':
Fix bug to update last interpolated index of GestureStroke
|
2013-05-15 10:36:10 -07:00 |
|
Jean Chalard
|
b1e37e4a47
|
am f1dcf725: Merge "Don\'t process recorrection or resets when not shown"
* commit 'f1dcf725061b3e61e40540566a5385cf4934f424':
Don't process recorrection or resets when not shown
|
2013-05-15 07:58:27 -07:00 |
|
Tadashi G. Takaoka
|
25f0c8089e
|
am 96a9f357: Merge "Fix unintentional setup step advance in orientation change"
* commit '96a9f357c7e2a059687926cd7cd52ac5d06bc65e':
Fix unintentional setup step advance in orientation change
|
2013-05-15 07:58:18 -07:00 |
|
Tadashi G. Takaoka
|
d59c1f8324
|
am 50259c70: Merge "Tune layout parameters of setup wizard"
* commit '50259c70d7754569a7b552cfc6ef8a034b5b0d40':
Tune layout parameters of setup wizard
|
2013-05-15 07:58:05 -07:00 |
|
Tadashi G. Takaoka
|
7d9bd6f54e
|
am 66b87269: Update welcome fallback image (using xhdpi asset)
* commit '66b87269e16a0ed4b13a58bca5dd3a41318ad241':
Update welcome fallback image (using xhdpi asset)
|
2013-05-15 07:57:51 -07:00 |
|
Tadashi G. Takaoka
|
7fe675440e
|
am 769427cf: Adjust aspect ratio of setup image
* commit '769427cff24944958f5f1f6179090a86444f3eab':
Adjust aspect ratio of setup image
|
2013-05-15 07:57:38 -07:00 |
|
Jean Chalard
|
f1dcf72506
|
Merge "Don't process recorrection or resets when not shown"
|
2013-05-15 11:25:25 +00:00 |
|
Jean Chalard
|
c9aaba1253
|
Don't process recorrection or resets when not shown
Bug: 8954116
Change-Id: Ica27dbfc570643bb81e6cdf34cc7c796ea080d71
|
2013-05-15 20:20:20 +09:00 |
|