Kurt Partridge
867b2380b9
am 35e02ccd: am bf62dc03: am ef103e1f: Merge "Close ResearchLogger upon onFinishInputView"
...
* commit '35e02ccdda43bb40cf95bca5ec0d96e55848d862':
2013-04-03 19:23:58 -07:00
The Android Open Source Project
a6dcb55eab
am 62adeccd: am 577f08a3: am 22384b57: (-s ours) am 0ed901ff: (-s ours) Reconcile with jb-mr2-release - do not merge
...
* commit '62adeccdcab0c41d502214f31c7a0fa333638e13':
2013-04-03 19:23:57 -07:00
Kurt Partridge
35e02ccdda
am bf62dc03: am ef103e1f: Merge "Close ResearchLogger upon onFinishInputView"
...
* commit 'bf62dc036f1e71751c8713ff13e686bbf635d6c3':
Close ResearchLogger upon onFinishInputView
2013-04-03 19:20:59 -07:00
The Android Open Source Project
62adeccdca
am 577f08a3: am 22384b57: (-s ours) am 0ed901ff: (-s ours) Reconcile with jb-mr2-release - do not merge
...
* commit '577f08a3d76343f67f6f68c4f8198557e73939dd':
2013-04-03 19:20:58 -07:00
The Android Open Source Project
d2582473b0
am 22953740: Reconcile with jb-mr2-release - do not merge
...
* commit '229537407a05b96f9a8bc77de8bb9830c7ad3083':
2013-04-03 18:05:33 -07:00
The Android Open Source Project
229537407a
Reconcile with jb-mr2-release - do not merge
...
Change-Id: I00b5f6a7f1d9578933c846c7614eae3bff5b85f0
2013-04-03 16:43:45 -07:00
Baligh Uddin
e7d9119454
am 370070ae: am 4cdb7ccb: Import translations. DO NOT MERGE
...
* commit '370070ae6bfe0af7186d76b61fd6c7bc60eb52b4':
Import translations. DO NOT MERGE
2013-04-03 15:37:55 -07:00
Baligh Uddin
370070ae6b
am 4cdb7ccb: Import translations. DO NOT MERGE
...
* commit '4cdb7ccb325db33fa812855b6ea6de2533cdb6be':
Import translations. DO NOT MERGE
2013-04-03 15:34:22 -07:00
Baligh Uddin
4b8494c4fc
Import translations. DO NOT MERGE
...
Change-Id: I66b30c5f9673fc4ed3b96753cfec023e7d498dec
Auto-generated-cl: translation import
2013-04-03 13:13:26 -07:00
Baligh Uddin
4cdb7ccb32
Import translations. DO NOT MERGE
...
Change-Id: Ic405d085ced9e64efd9b7da38097734c71808fbc
Auto-generated-cl: translation import
2013-04-03 13:06:22 -07:00
Satoshi Kataoka
95fe826795
Move suggest logic to AOSP
...
Bug: 8197301
Change-Id: I2d0ffbbc9d4d57ebfc2fe43e6cb75e8b44dae466
2013-04-03 21:00:57 +09:00
The Android Automerger
1a65d4684b
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-02 09:19:17 -07:00
Jean-Baptiste Queru
30667266dd
am 5bcb3876: Merge 2caa1d81ce
- do not merge
...
* commit '5bcb3876e2df2523017b4617102518b1523499b9':
Import translations. DO NOT MERGE
2013-04-02 07:51:33 -07:00
Jean-Baptiste Queru
5bcb3876e2
Merge 2caa1d81ce
- do not merge
...
Change-Id: I49fb6693ae1231235b91c48058bf9d3daa74e38f
2013-04-02 07:49:43 -07:00
Jean Chalard
868805aec4
Merge "Change which backdoor the tests goes through"
2013-04-02 09:36:02 +00:00
Jean Chalard
248dcdf0eb
Merge "Fix a test."
2013-04-02 09:23:02 +00:00
Jean Chalard
5d399ec719
Change which backdoor the tests goes through
...
Yes that's even harder to understand. The old technique doesn't work
any more, so I have to drill a new hole in this class.
Bug: 8303100
Change-Id: I70a41b5094dab2bb56a17eaf55b2a2df853e4bb6
2013-04-02 18:20:19 +09:00
Jean Chalard
84bfde0421
Fix a test.
...
The test was not passing the correct input type when it was
creating the text view, resulting in mismatched types seen from
TextView and LatinIME with some bad results. The test would
even go as far as restoring it after it's been fixed by TextView.
Additionally, since we want to enter litteral carriage returns,
the input type should be MULTI_LINE. If not, TextView does
not allow carriage returns.
Bug: 8302690
Change-Id: I1c20bcf6ca554ad981048ec181e19c649f6c742e
2013-04-02 18:20:14 +09:00
Satoshi Kataoka
d2a04e1e79
Merge "Move typing policy to AOSP"
2013-04-02 07:54:43 +00:00
Satoshi Kataoka
a6a4165196
Move typing policy to AOSP
...
Bug: 8197301
Change-Id: Ife9b41a465d7b8d707623a6d3e4c1c88c3c3c4ab
2013-04-02 16:53:53 +09:00
Jean Chalard
ecb59eff90
Revert "[DO NOT MERGE] Activate hardware keyboard handling"
...
This reverts commit c741f1f83b
DO NOT MERGE is ignored and this is merged anyway :(
Change-Id: Ie044cdfc6021933379ec97ad7346c5c8591f70bf
2013-04-02 16:08:48 +09:00
Jean Chalard
c741f1f83b
[DO NOT MERGE] Activate hardware keyboard handling
...
Change-Id: Ifdec9338a454291621b2b87c899f5d4301480b27
2013-04-02 15:38:13 +09:00
Kurt Partridge
5779bc91e6
Merge "Split LogUnits differently."
2013-04-01 23:08:21 +00:00
Baligh Uddin
02fc1ed512
Merge "Import translations. DO NOT MERGE"
2013-04-01 20:54:38 +00:00
Baligh Uddin
2caa1d81ce
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
2013-04-01 20:53:56 +00:00
Kurt Partridge
0c0ab2b4d9
Merge "Reorder ResearchLogger call"
2013-04-01 15:19:45 +00:00
Jean Chalard
0745fe83d4
am b8869ec1: am 0fcc4960: Deactivate hardware keyboard handling.
...
* commit 'b8869ec1e39c1751825841e790d21fc854dca9ce':
Deactivate hardware keyboard handling.
2013-04-01 05:42:42 -07:00
Jean Chalard
b8869ec1e3
am 0fcc4960: Deactivate hardware keyboard handling.
...
* commit '0fcc4960bcd037b7e1482098f85342743eb2ddee':
Deactivate hardware keyboard handling.
2013-04-01 05:40:07 -07:00
Jean Chalard
0fcc4960bc
Deactivate hardware keyboard handling.
...
Bug: 8000119
Change-Id: I021481343d6d87efd8ff6110e9aa0906a1a3d11d
2013-04-01 21:35:45 +09:00
Tadashi G. Takaoka
9413e957fa
Merge "Interpolate gesture preview trails"
2013-04-01 10:23:27 +00:00
Tadashi G. Takaoka
75028af28c
Interpolate gesture preview trails
...
There is the boolean flag to kill interpolation.
Bug: 7167303
Change-Id: Iac7e4cb88cf437c2ee77c003c9cddb92416025c7
2013-04-01 19:15:36 +09:00
Satoshi Kataoka
54c091d284
Merge "Move policy and session to AOSP"
2013-04-01 09:50:31 +00:00
Satoshi Kataoka
3107b467c9
Move policy and session to AOSP
...
Bug: 8197301
Change-Id: I742ff0d939f9ad1ee2cd8b959b6c5ee2757fd177
2013-04-01 18:15:08 +09:00
Jean Chalard
43341ba042
Merge "Ask the client to make itself known when it's not"
2013-04-01 09:00:25 +00:00
Jean Chalard
76d5f512f9
Ask the client to make itself known when it's not
...
Upon invoking the settings of the dictionary pack with an unknown
client, we now launch an intent to ask the client to make itself known.
This change also includes the code that receives this intent and
acts upon it.
Bug: 8492879
Change-Id: I2c6496dea845646961ecafcf64e282cb93ee91dc
2013-04-01 17:37:22 +09:00
Jean Chalard
065f126f1d
Merge "Fix two nasty bugs with surrogate pairs."
2013-04-01 08:28:08 +00:00
Jean Chalard
a411595b16
Fix two nasty bugs with surrogate pairs.
...
The important bug is in findWordInTree. The problem, which is
not obvious, is that we were calling codePointAt() with the
code point index in the string, instead of the char index.
The other bug this change fixes was harmless in the practice,
because it's in the iteration which is only used for debug and
pretty printing purposes. It's very similar in that it would
substract a length in code point to a length in chars and
truncate a StringBuilder at that length, so it would fail in a
quite similar manner. This changes the meaning of the "length"
attribute in Position, but it's clearer this way anyway.
Bug: 8450145
Change-Id: If396f883a9e6449de39351553ba83f5be5bd30f0
2013-04-01 17:06:19 +09:00
Satoshi Kataoka
38c26dd0bf
Move dicnode to AOSP
...
Bug: 8187060
Change-Id: I72398fa45b12683bd46d23c5ca69e6bcd5ca2b7e
2013-04-01 16:14:14 +09:00
Baligh Uddin
bd4fdf8e4e
Import translations. DO NOT MERGE
...
Change-Id: I8752437b40f9f8bcb7b8920bc1dc4342e51b3621
Auto-generated-cl: translation import
2013-03-29 21:27:10 -07:00
Baligh Uddin
cea6a7a2a3
Import translations. DO NOT MERGE
...
Change-Id: I19c04b125fc3d2a6dd7b0a32ee90f098d931f83b
Auto-generated-cl: translation import
2013-03-29 21:21:20 -07:00
The Android Open Source Project
c1dec87a76
am b35915fb: (-s ours) Reconcile with jb-mr2-release - do not merge
...
* commit 'b35915fb5095f18554d62dfc148eb1027cefa005':
2013-03-29 09:54:38 -07:00
The Android Open Source Project
b35915fb50
Reconcile with jb-mr2-release - do not merge
...
Change-Id: Iba9f399b20d62611002d4353e00355b2550dbb1d
2013-03-29 09:49:25 -07:00
Satoshi Kataoka
97a3ce022c
Merge "Refactor"
2013-03-29 10:57:45 +00:00
Satoshi Kataoka
394b0bd345
Refactor
...
Change-Id: Ie50fdd1081d306e520300245498a605e79e03818
2013-03-29 18:49:50 +09:00
Jean Chalard
740da0d8d0
Fix an NPE
...
Also remove an unused method and make 2 private variables
final.
Bug: 8461093
Change-Id: I676d93fda28e82eb5a6978f2e7ad5a0add2cbecf
2013-03-29 18:41:29 +09:00
The Android Automerger
0574e46c73
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-03-28 05:56:26 -07:00
Tadashi G. Takaoka
48d8d8d0ae
Fix potential NPE in MainKeyboardView.KeyTimerHandler
...
Bug: 8469652
Change-Id: Ib7a548e6a24d2e02de85ab444c0ec99d8f6b82c3
2013-03-28 17:54:36 +09:00
Jean Chalard
2188cbae63
Merge "Fix an NPE"
2013-03-28 06:56:49 +00:00
Jean Chalard
d555a0d77a
Merge "Cleanup"
2013-03-28 06:16:40 +00:00
Jean Chalard
28d5f4577f
Fix an NPE
...
The code was passing the wrong parameter.
Bug: 8492879
Change-Id: I091d62ca29601e3807eed287c7bdad38bf43a502
2013-03-28 15:08:05 +09:00