Jean Chalard
4f7d137e45
am 36fe3241
: am 68966c7e
: Merge "Remove arity from dicttool commands (A1)" into jb-mr1-dev
...
* commit '36fe3241842819b6bffb9309b0c7f4d48cd910bd':
Remove arity from dicttool commands (A1)
2012-08-03 07:18:48 -07:00
Jean Chalard
288caf33cb
am a777a86f
: Merge "Simplification (A2)" into jb-mr1-dev
...
* commit 'a777a86f4b311ccdf1443faf0d1759e445ef138e':
Simplification (A2)
2012-08-03 07:18:22 -07:00
Jean Chalard
3f80541844
Merge "Fix an OOB exception" into jb-mr1-dev
2012-08-03 07:17:37 -07:00
Jean Chalard
36fe324184
am 68966c7e
: Merge "Remove arity from dicttool commands (A1)" into jb-mr1-dev
...
* commit '68966c7e0ec89ccb0d2e1f285917163ea9e7b5ee':
Remove arity from dicttool commands (A1)
2012-08-03 07:16:41 -07:00
Jean Chalard
a777a86f4b
Merge "Simplification (A2)" into jb-mr1-dev
2012-08-03 07:15:47 -07:00
Jean Chalard
68966c7e0e
Merge "Remove arity from dicttool commands (A1)" into jb-mr1-dev
2012-08-03 07:14:23 -07:00
Jean Chalard
4c976aceee
Fix an OOB exception
...
Not sure exactly how this can happen, but at least this should
prevent us from crashing.
Bug: 6920884
Change-Id: I451864756b48c5cb5e98b06edee917d88766d77f
2012-08-03 23:10:47 +09:00
Jean Chalard
82cd20ee98
Simplification (A2)
...
A single command at a time and no arity gives opportunity to simplify
the argument parsing code.
Change-Id: Iff7bab78ede7448a662092f221c590a9eedae2a5
2012-08-03 23:02:39 +09:00
Jean Chalard
77c8c73837
Remove arity from dicttool commands (A1)
...
This unnecessarily complicates and limits commands.
It's simpler to just have one command by invocation.
Groundwork for
Bug: 6429606
Change-Id: I24cf267a9cbc937a5ba53942b29e28e7095d2fd2
2012-08-03 23:02:06 +09:00
Tadashi G. Takaoka
83b3289a03
am be7897a0
: am 6242564c
: Merge "Using hardware accelerated drawing" into jb-mr1-dev
...
* commit 'be7897a04ab38a91d1b4afcf54c9ac668abf2e44':
Using hardware accelerated drawing
2012-08-03 04:59:09 -07:00
Tadashi G. Takaoka
be7897a04a
am 6242564c
: Merge "Using hardware accelerated drawing" into jb-mr1-dev
...
* commit '6242564c91d47885075bf2bd1e1bb0760de76c10':
Using hardware accelerated drawing
2012-08-03 04:55:54 -07:00
Tadashi G. Takaoka
6242564c91
Merge "Using hardware accelerated drawing" into jb-mr1-dev
2012-08-03 04:47:33 -07:00
Tadashi G. Takaoka
622d6a5b1b
Using hardware accelerated drawing
...
When Canvas has been hardware accelerated, don't use offscreen bitmap.
Bug: 6872994
Change-Id: I1121f76377991692bc29ebeedbfbfa1b2a12dbb7
2012-08-03 20:46:10 +09:00
Ken Wakasa
9b6d0384d0
am b43a1713
: am 1d8a246e
: Header cleanup
...
* commit 'b43a1713c563b84c1c811724c72c7e0b8a8b2385':
Header cleanup
2012-08-03 02:49:17 -07:00
Ken Wakasa
b43a1713c5
am 1d8a246e
: Header cleanup
...
* commit '1d8a246e392e0ab4b1e7c8a60e67c00fca05c93c':
Header cleanup
2012-08-03 02:47:12 -07:00
Ken Wakasa
1d8a246e39
Header cleanup
...
Change-Id: I1aa91708d0de01ca3e84e69ec8d3a3832c386ca8
2012-08-03 18:37:58 +09:00
The Android Open Source Project
8cb71c2367
am 3666f42b
: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '3666f42b4574226d17566660ca0945ec30ee528a':
2012-08-02 15:09:17 -07:00
Ken Wakasa
50d7388e6d
am 6c465d9d
: am 77e8e81a
: Header cleanup. Moved a couple of functions from .h to .cpp.
...
* commit '6c465d9d26c7389357dedd4b71c6a95ccb6f019c':
Header cleanup. Moved a couple of functions from .h to .cpp.
2012-08-02 15:08:38 -07:00
Tadashi G. Takaoka
00fe40242c
am 2af1b124
: am ffe36cdc
: Merge "Small cleanup for keyboard drawing code" into jb-mr1-dev
...
* commit '2af1b1241b120e0e9df53edd415601e14fc54e0e':
Small cleanup for keyboard drawing code
2012-08-02 15:08:32 -07:00
Tadashi G. Takaoka
50836af6c3
am ab4d177a
: am 76c242a1
: Merge "Fix multi-touch input in auto-caps field" into jb-mr1-dev
...
* commit 'ab4d177a0eacad55f66b1bfb7448ab39a636d819':
Fix multi-touch input in auto-caps field
2012-08-02 15:08:24 -07:00
Ken Wakasa
6f3454be71
am 90817001
: am fb955693
: Enable hardware accelerated drawing for SoftInputWindow of LatinIME
...
* commit '908170017208ee2cf84d5857cb33e13b0443c919':
Enable hardware accelerated drawing for SoftInputWindow of LatinIME
2012-08-02 15:08:22 -07:00
The Android Open Source Project
3666f42b45
Reconcile with jb-mr1-release - do not merge
...
Change-Id: Ia6cd9f9da1393801f6aeca58eafb6740bae275ca
2012-08-02 11:27:30 -07:00
The Android Automerger
d4afbf9b98
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-02 08:18:20 -07:00
Ken Wakasa
6c465d9d26
am 77e8e81a
: Header cleanup. Moved a couple of functions from .h to .cpp.
...
* commit '77e8e81ad95cfc1eb8f8407fc872674b8d08bbe9':
Header cleanup. Moved a couple of functions from .h to .cpp.
2012-08-02 05:07:43 -07:00
Ken Wakasa
77e8e81ad9
Header cleanup. Moved a couple of functions from .h to .cpp.
...
Change-Id: Ifd12a7632f75395bd0ef5e394d5c2abd6cbe28c6
2012-08-02 20:19:39 +09:00
Tadashi G. Takaoka
2af1b1241b
am ffe36cdc
: Merge "Small cleanup for keyboard drawing code" into jb-mr1-dev
...
* commit 'ffe36cdc6d41d0ad1031e7d9f8acf6b6f1008970':
Small cleanup for keyboard drawing code
2012-08-02 01:13:52 -07:00
Tadashi G. Takaoka
ffe36cdc6d
Merge "Small cleanup for keyboard drawing code" into jb-mr1-dev
2012-08-02 01:04:05 -07:00
Tadashi G. Takaoka
8344259fc9
Small cleanup for keyboard drawing code
...
Change-Id: I8b562e03b30f82dddae311b49d316402e867cd31
2012-08-02 16:50:31 +09:00
Tadashi G. Takaoka
ab4d177a0e
am 76c242a1
: Merge "Fix multi-touch input in auto-caps field" into jb-mr1-dev
...
* commit '76c242a1f6ac2f4d50f23214dd8652e398194da9':
Fix multi-touch input in auto-caps field
2012-08-01 23:53:03 -07:00
Tadashi G. Takaoka
76c242a1f6
Merge "Fix multi-touch input in auto-caps field" into jb-mr1-dev
2012-08-01 23:45:24 -07:00
Ken Wakasa
9081700172
am fb955693
: Enable hardware accelerated drawing for SoftInputWindow of LatinIME
...
* commit 'fb955693d4bb0c8d39092250a4208e385b8a31a7':
Enable hardware accelerated drawing for SoftInputWindow of LatinIME
2012-08-01 23:36:14 -07:00
Ken Wakasa
fb955693d4
Enable hardware accelerated drawing for SoftInputWindow of LatinIME
...
Taking advantage of Ib6a8bda46223ce1153f32834daf02a820d16136e
bug: 6872994
Change-Id: I799b25b6509980dd9f039bead9bc926b42cbb040
2012-08-02 15:11:31 +09:00
Kurt Partridge
b3b14f5020
Merge "ResearchLogger to track simple statistics"
2012-08-01 20:24:17 -07:00
Kurt Partridge
5d6cdef255
ResearchLogger to track simple statistics
...
Bug: 6188932
Change-Id: I1ecb5e1fd08f17af998b87414771fa7d90ef5f81
2012-08-01 20:19:35 -07:00
Kurt Partridge
0db6b5b874
Merge "ResearchLogger log RichInputConnection"
2012-08-01 20:15:49 -07:00
Kurt Partridge
2996cf24ef
ResearchLogger log RichInputConnection
...
Move many ResearchLogger data collection points to RichInputConnection.
By collecting data here, developers do not have to remember to keep the
ResearchLog consistent with calls to the RichInputConnection.
In addition, some unnecessary log points were removed, and the ResearchLogger
is now independent of LatinImeLogger.
multi-project change with I67bbf5fe8fd821da967a50b69e467caafc7fd388
Bug: 6188932
Change-Id: I49ccee1dcffe8d41401b42a637dd0da8dd11d90d
2012-08-01 19:22:33 -07:00
Ying Wang
57b709439d
am 1b562db5
: (-s ours) am 2ca0f262
: Import translations. DO NOT MERGE
...
* commit '1b562db5c93cafa3e96071ee2ba1de07b21de418':
Import translations. DO NOT MERGE
2012-08-01 15:37:31 -07:00
Ying Wang
1b562db5c9
am 2ca0f262
: Import translations. DO NOT MERGE
...
* commit '2ca0f2623751cb12c6b9a94af1a73e6a04db0b08':
Import translations. DO NOT MERGE
2012-08-01 15:34:01 -07:00
Ying Wang
e7f1dd9141
Merge "Import translations. DO NOT MERGE"
2012-08-01 15:22:00 -07:00
Ying Wang
d6609e4df9
Import translations. DO NOT MERGE
...
Change-Id: I4e27d3edd7beb65232912c51cf531d6989768540
Auto-generated-cl: translation import
2012-08-01 15:04:46 -07:00
Ying Wang
2ca0f26237
Import translations. DO NOT MERGE
...
Change-Id: Ifdbe0c41f5e01c4afc155ea68c05d50d483e5749
Auto-generated-cl: translation import
2012-08-01 14:58:52 -07:00
The Android Open Source Project
66b603be96
am 2afdd4c4
: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '2afdd4c4273ba3c772da45478a79ee6b2fe1c9e0':
2012-08-01 14:50:41 -07:00
The Android Open Source Project
2afdd4c427
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I916d5d2df8ba081a431b8eb5a999e3e07f789e96
2012-08-01 13:12:27 -07:00
The Android Automerger
8e660c9cac
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-01 07:18:38 -07:00
Tadashi G. Takaoka
44972bcdb6
Fix multi-touch input in auto-caps field
...
Bug: 6905194
Change-Id: I7f9f61f36b7f3aa2b40c126a68232a947976aad2
2012-08-01 18:56:11 +09:00
Ken Wakasa
5e5d0b83a6
am bc892446
: am 74fb957e
: Header cleanup
...
* commit 'bc8924467eae6cc5dc456cb1fbe4ec97b5b9cf9b':
Header cleanup
2012-08-01 02:52:29 -07:00
Ken Wakasa
bc8924467e
am 74fb957e
: Header cleanup
...
* commit '74fb957e49e7d9ff5af47f35d062aa7c7f97a8fc':
Header cleanup
2012-08-01 02:50:36 -07:00
Ken Wakasa
74fb957e49
Header cleanup
...
Change-Id: Idaf19de3dc75367d49bc01e84e5a9f057c1f8dba
2012-08-01 18:46:07 +09:00
The Android Open Source Project
dcc80c1395
am c2300d84
: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit 'c2300d841afeb33f64cc9a3896bbbdf4bd39e62a':
2012-07-31 15:06:09 -07:00
The Android Open Source Project
c2300d841a
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I759cbab32b17e45dd3d3e97ccf5e6039cfdff691
2012-07-31 15:04:08 -07:00