Commit graph

11522 commits

Author SHA1 Message Date
Jean Chalard
7cd0ffdde4 am 248dcdf0: Merge "Fix a test."
* commit '248dcdf0eb69903368b3c2bf0e9eda574d1ebf9e':
  Fix a test.
2013-04-02 02:24:36 -07: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
63742fe530 am d2a04e1e: Merge "Move typing policy to AOSP"
* commit 'd2a04e1e791de513c67ac9ded915fdbd074dda05':
  Move typing policy to AOSP
2013-04-02 00:57:07 -07: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
6531bcdc82 am ecb59eff: (-s ours) Revert "[DO NOT MERGE] Activate hardware keyboard handling"
* commit 'ecb59eff90c6cfd8d3e6ae31961d7f27f8c9eac9':
  Revert "[DO NOT MERGE] Activate hardware keyboard handling"
2013-04-02 00:13:32 -07: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
558f41d402 am c741f1f8: (-s ours) [DO NOT MERGE] Activate hardware keyboard handling
* commit 'c741f1f83b98293bf0040b6b81e95b75ecf3f6bc':
  [DO NOT MERGE] Activate hardware keyboard handling
2013-04-01 23:58:35 -07:00
Jean Chalard
c741f1f83b [DO NOT MERGE] Activate hardware keyboard handling
Change-Id: Ifdec9338a454291621b2b87c899f5d4301480b27
2013-04-02 15:38:13 +09:00
Kurt Partridge
228d45337b am 5779bc91: Merge "Split LogUnits differently."
* commit '5779bc91e6d425dc42e444a11057dd286e736203':
  Split LogUnits differently.
2013-04-01 16:10:08 -07:00
Kurt Partridge
5779bc91e6 Merge "Split LogUnits differently." 2013-04-01 23:08:21 +00:00
Baligh Uddin
0491706a53 am 02fc1ed5: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '02fc1ed51243e501c14274b9c6646b930117464b':
  Import translations. DO NOT MERGE
2013-04-01 13:56:57 -07:00
Baligh Uddin
02fc1ed512 Merge "Import translations. DO NOT MERGE" 2013-04-01 20:54:38 +00:00
Baligh Uddin
9bf7e74dc4 Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle 2013-04-01 20:54:08 +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
6c522b53f0 am 0c0ab2b4: Merge "Reorder ResearchLogger call"
* commit '0c0ab2b4d9303274c26ef70f7228f2d54e2d59f5':
  Reorder ResearchLogger call
2013-04-01 08:21:01 -07:00
Kurt Partridge
0c0ab2b4d9 Merge "Reorder ResearchLogger call" 2013-04-01 15:19:45 +00:00
Jean Chalard
bfd7dcd5b2 am 0745fe83: am b8869ec1: am 0fcc4960: Deactivate hardware keyboard handling.
* commit '0745fe83d4033bdeec807a12fea1da29b41c8a99':
  Deactivate hardware keyboard handling.
2013-04-01 05:46:15 -07: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
b08506c221 am 9413e957: Merge "Interpolate gesture preview trails"
* commit '9413e957fafcf4660f2f620f8fe716d9ba448d92':
  Interpolate gesture preview trails
2013-04-01 03:25:25 -07: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
ac8703263d am 54c091d2: Merge "Move policy and session to AOSP"
* commit '54c091d284b15e14cbcbce983354f679526672ec':
  Move policy and session to AOSP
2013-04-01 02:52:03 -07: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
e40d563365 am 43341ba0: Merge "Ask the client to make itself known when it\'s not"
* commit '43341ba04298f9548e3ee6f37403eaf333dfa3bc':
  Ask the client to make itself known when it's not
2013-04-01 02:01:48 -07: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
151e4e182c am 065f126f: Merge "Fix two nasty bugs with surrogate pairs."
* commit '065f126f1d91b8b2647cbe185a55ac8e771cb32d':
  Fix two nasty bugs with surrogate pairs.
2013-04-01 01:30:38 -07: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
bde25a4a63 am 38c26dd0: Move dicnode to AOSP
* commit '38c26dd0bf8cd5c4511e4a02d5eeae4b3553f03a':
  Move dicnode to AOSP
2013-04-01 00:52:38 -07: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
df4ad49d57 Import translations. DO NOT MERGE
Change-Id: I4c79f5d3019934dba5a606e7a57ecaf2059daa3f
Auto-generated-cl: translation import
2013-03-29 21:22:58 -07:00
Baligh Uddin
990113c750 Import translations. DO NOT MERGE
Change-Id: Ib805aeefe668e6c2d79d64dad8c14cbd7d633f46
Auto-generated-cl: translation import
2013-03-29 21:22:11 -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
08f5b7802a am c1dec87a: (-s ours) am b35915fb: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit 'c1dec87a76565c5dfa223c7d4d5f10a345ab3799':
2013-03-29 09:58:07 -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
70747ad6c3 am 97a3ce02: Merge "Refactor"
* commit '97a3ce022c4f158712fb803f7acd0151719b336e':
  Refactor
2013-03-29 03:59:59 -07:00
Satoshi Kataoka
97a3ce022c Merge "Refactor" 2013-03-29 10:57:45 +00:00
Jean Chalard
a38d907b96 am 740da0d8: Fix an NPE
* commit '740da0d8d0b29297fba75f4b63ccff28fc1f4a14':
  Fix an NPE
2013-03-29 03:56:43 -07: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