da4636f583
am 8be83b84: Reconcile with jb-release
...
* commit '8be83b841ffd5b02195073070cec9f041541cad9':
2012-05-30 10:22:16 -07:00
8be83b841f
Reconcile with jb-release
...
Change-Id: I2135fa879e0f56fcf98bf3f489dae804d51e80b4
2012-05-30 10:16:28 -07:00
0540997a7f
merge in jb-release history after reset to jb-dev
2012-05-30 07:05:51 -07:00
4e3d9d375e
am 9f41befb: am 9afafd0e: Merge "Restrict phantom sudden move event hack to specific device" into jb-dev
...
* commit '9f41befb8b5f4d86a03f9eb7e2d80148e9b55428':
Restrict phantom sudden move event hack to specific device
2012-05-30 03:59:36 -07:00
9f41befb8b
am 9afafd0e: Merge "Restrict phantom sudden move event hack to specific device" into jb-dev
...
* commit '9afafd0ebed0bb25beaf269f9e037980b8f24323':
Restrict phantom sudden move event hack to specific device
2012-05-30 03:57:36 -07:00
9afafd0ebe
Merge "Restrict phantom sudden move event hack to specific device" into jb-dev
2012-05-30 03:55:35 -07:00
d438fcaca2
Restrict phantom sudden move event hack to specific device
...
Bug: 6571778
Change-Id: I4306af387074d34db68a9bb16ae41debcfc36bfd
2012-05-30 19:49:38 +09:00
0078d18f69
am 56d64b7c: am 38da968a: Merge "Cleanup keyboard-heights.xml resources" into jb-dev
...
* commit '56d64b7c03d63a8347ed0f658307a75f2610d2a2':
Cleanup keyboard-heights.xml resources
2012-05-30 03:46:04 -07:00
56d64b7c03
am 38da968a: Merge "Cleanup keyboard-heights.xml resources" into jb-dev
...
* commit '38da968a9aa4b7c46b441916555f657cf68dbb3f':
Cleanup keyboard-heights.xml resources
2012-05-30 03:43:00 -07:00
38da968a9a
Merge "Cleanup keyboard-heights.xml resources" into jb-dev
2012-05-30 03:39:19 -07:00
f4ca178fc7
Cleanup keyboard-heights.xml resources
...
Change-Id: If33643045ad6ff7ea9fdf3f974564cb40f1db041
2012-05-30 19:33:30 +09:00
023ca7609e
am d8096b1a: am 6cbe204f: Fix the performance issue on suggesting aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
...
* commit 'd8096b1a12ce1f6f53a2b269956043d77276f007':
Fix the performance issue on suggesting aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
2012-05-30 02:52:42 -07:00
d8096b1a12
am 6cbe204f: Fix the performance issue on suggesting aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
...
* commit '6cbe204fce109fab652da15f4c8ea1ae35fca3e7':
Fix the performance issue on suggesting aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
2012-05-30 02:50:29 -07:00
6cbe204fce
Fix the performance issue on suggesting aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
...
Bug: 6576793
Change-Id: I46f56654cd25dc28668ad75ac71e0e3beb8cdcf3
2012-05-30 18:43:23 +09:00
3d7312af5b
am 40bab488: am 4f78f8cb: Merge "Remove a vibration-related option when there\'s no vibrator" into jb-dev
...
* commit '40bab488cb70875f46e29f595d577cc6cc4a9264':
Remove a vibration-related option when there's no vibrator
2012-05-29 23:37:09 -07:00
40bab488cb
am 4f78f8cb: Merge "Remove a vibration-related option when there\'s no vibrator" into jb-dev
...
* commit '4f78f8cb795a754bbe36b3334cb77e2a5b59c278':
Remove a vibration-related option when there's no vibrator
2012-05-29 23:34:34 -07:00
4f78f8cb79
Merge "Remove a vibration-related option when there's no vibrator" into jb-dev
2012-05-29 23:31:44 -07:00
c7f2878cf5
Remove a vibration-related option when there's no vibrator
...
Bug: 6567160
Change-Id: I1b5d425ffb64b2d7390cd0b7be0825f6aca17f41
2012-05-30 15:24:59 +09:00
046f7fc702
am 987aa153: am 62cd919d: Remove a compiler warning.
...
* commit '987aa1536b762070138ba40485a10e4caac01c48':
Remove a compiler warning.
2012-05-29 22:56:55 -07:00
987aa1536b
am 62cd919d: Remove a compiler warning.
...
* commit '62cd919dca9ef85cdd045b539b3ef85e921c6e4c':
Remove a compiler warning.
2012-05-29 22:54:21 -07:00
62cd919dca
Remove a compiler warning.
...
Change-Id: Id2c949d03a2e38787cbf3c8f99313bcfe8610a1f
2012-05-30 14:46:43 +09:00
2eb92f7cc5
am 719badd1: (-s ours) am 902275cb: Import translations. DO NOT MERGE
...
* commit '719badd135bad4ea52d8c4336ba2bc4541693e5b':
Import translations. DO NOT MERGE
2012-05-29 19:01:21 -07:00
719badd135
am 902275cb: Import translations. DO NOT MERGE
...
* commit '902275cb5d30afa6e31931b990666bf1fab79225':
Import translations. DO NOT MERGE
2012-05-29 18:58:43 -07:00
30ff0898fd
Merge "Fixes to json output"
2012-05-29 17:48:50 -07:00
902275cb5d
Import translations. DO NOT MERGE
...
Change-Id: I50bf9fee5d80982699b696871987df047c569d18
2012-05-29 15:00:57 -07:00
86fcadde5d
Fixes to json output
...
- booleans and numbers in SharedPreferences not quoted as strings
- removed redundant logging from KeyboardState
- json output for KeyboardId
- remove unnecessary logging of LatinImeLogger.onStartView() and PointerTracker checking keyboardlayoutchange
- fix to day-of-month part of uuid
Multi-project commit with Idb8f190214f852ab2b58df49f9e514dc7fcbecbb
Bug: 6188932
Change-Id: I67b4a0b34aa26c2804e2b3ee2136614f0ec8181a
2012-05-29 14:04:05 -07:00
609ce32a4d
am 126ed424: am 1ed017ef: Fix performance issue when there are no contacts in the dictionary dictionary.
...
* commit '126ed42415a4dc3841e8981a23cbe8a22a9e2213':
Fix performance issue when there are no contacts in the dictionary dictionary.
2012-05-29 10:12:33 -07:00
126ed42415
am 1ed017ef: Fix performance issue when there are no contacts in the dictionary dictionary.
...
* commit '1ed017ef0e271ed3f3c212def6cc6ba95b14e780':
Fix performance issue when there are no contacts in the dictionary dictionary.
2012-05-29 10:09:29 -07:00
1ed017ef0e
Fix performance issue when there are no contacts in the dictionary dictionary.
...
Bug: 6551480
Change-Id: I8681a1bd82423c612af2d012f9b872501d8c201d
2012-05-29 09:45:42 -07:00
9bcd9b26ac
am c0749033: Reconcile with jb-release nakasi-factoryrom-release
...
* commit 'c074903330415ce304177e9d6e062b43d337e232':
2012-05-29 09:45:12 -07:00
c074903330
Reconcile with jb-release nakasi-factoryrom-release
...
Change-Id: Ie760d80e44abe7a9de08f417ff107aa86b398e96
2012-05-29 09:41:22 -07:00
9d19ffc832
merge in jb-release history after reset to jb-dev
2012-05-29 09:00:57 -07:00
c5d4362b59
am 408fa1ac: am 961e676b: Merge "Set level 1 as the initial value of the valid words" into jb-dev
...
* commit '408fa1ac48a3eb6f378274d5dd0e490da0f453ae':
Set level 1 as the initial value of the valid words
2012-05-29 04:49:33 -07:00
408fa1ac48
am 961e676b: Merge "Set level 1 as the initial value of the valid words" into jb-dev
...
* commit '961e676b9a6b8282b1049715523aa520d3b6a6e5':
Set level 1 as the initial value of the valid words
2012-05-29 04:46:35 -07:00
961e676b9a
Merge "Set level 1 as the initial value of the valid words" into jb-dev
2012-05-29 04:43:54 -07:00
c88f61215c
Set level 1 as the initial value of the valid words
...
Bug: 4192129
Change-Id: I867e78ce79c78977d08e8b66881a25b6fe5bf41f
2012-05-29 20:39:39 +09:00
2033d9880e
am 08c295c5: am 9a321180: Add unit tests for double tap shift key
...
* commit '08c295c5bb8d48b26a4486ed42a32a955b39ddd3':
Add unit tests for double tap shift key
2012-05-29 03:31:09 -07:00
8f3b46fc69
am c79a7104: am 2959fc0f: Delay shift lock transient until long pressed shift key is released
...
* commit 'c79a710445cca2a69dca9600a2c06eadcb253b62':
Delay shift lock transient until long pressed shift key is released
2012-05-29 03:31:08 -07:00
08c295c5bb
am 9a321180: Add unit tests for double tap shift key
...
* commit '9a3211802baf11e5749a080e4f451ef7b795220b':
Add unit tests for double tap shift key
2012-05-29 03:28:42 -07:00
c79a710445
am 2959fc0f: Delay shift lock transient until long pressed shift key is released
...
* commit '2959fc0f13ec29e05eda2c4a1e9a728350a80557':
Delay shift lock transient until long pressed shift key is released
2012-05-29 03:28:41 -07:00
9a3211802b
Add unit tests for double tap shift key
...
Bug: 6568746
Change-Id: I84db31ce86e3e043ac9f9bb971663a629fa3d3c7
2012-05-29 19:23:45 +09:00
d231d5d322
am 57da84da: am fb0a4ba8: Add unit tests for long press shift key
...
* commit '57da84dac4618c0848af02509b42cf913376f382':
Add unit tests for long press shift key
2012-05-29 03:03:19 -07:00
57da84dac4
am fb0a4ba8: Add unit tests for long press shift key
...
* commit 'fb0a4ba8fd7291e1bed0ec61bb7d2b5c8f93c1ad':
Add unit tests for long press shift key
2012-05-29 03:00:25 -07:00
2959fc0f13
Delay shift lock transient until long pressed shift key is released
...
Bug: 5424586
Change-Id: Ib602af1b38b1b109bdac9cb0c53132169556db2f
2012-05-29 18:14:11 +09:00
9afa42ddf0
am 7291fbce: am 16531ad5: Merge "More precise KeyboardState unit test" into jb-dev
...
* commit '7291fbce4776519f764a4a175951a9ae2a1c2a30':
More precise KeyboardState unit test
2012-05-29 02:11:59 -07:00
fb0a4ba8fd
Add unit tests for long press shift key
...
Bug: 5424586
Change-Id: I8465b7e2cebb07a135e24ea33eb7b7fb6752f7a2
2012-05-29 18:11:07 +09:00
7291fbce47
am 16531ad5: Merge "More precise KeyboardState unit test" into jb-dev
...
* commit '16531ad52f08cffab05fb653c5bf31c48fffbc3e':
More precise KeyboardState unit test
2012-05-29 02:09:37 -07:00
16531ad52f
Merge "More precise KeyboardState unit test" into jb-dev
2012-05-29 02:07:37 -07:00
9a989492db
am 40ab25ca: am 51705efc: Merge "Add a JNI to get the frequency" into jb-dev
...
* commit '40ab25cab0e723f34dc2f1442f414761149b2338':
Add a JNI to get the frequency
2012-05-29 01:32:48 -07:00
40ab25cab0
am 51705efc: Merge "Add a JNI to get the frequency" into jb-dev
...
* commit '51705efc96c1c555cf9e0f557ea8cdc1c1c97781':
Add a JNI to get the frequency
2012-05-29 01:30:26 -07:00
The Android Open Source Project
The Android Automerger
Tadashi G. Takaoka
Satoshi Kataoka
Jean Chalard
Eric Fischer
Kurt Partridge
Tom Ouyang