ea953fd555
am 49cc3beb: resolved conflicts for merge of 137667ed to master
...
* commit '49cc3beb75e2916037a0f8ff2d2795f306918598':
Ignore microphone and settings key while typing
2011-11-18 09:15:36 -08:00
49cc3beb75
resolved conflicts for merge of 137667ed to master
...
Change-Id: I75fc5d278b002ab89dd2475d282d0ee4aede7817
2011-11-18 08:51:39 -08:00
a25c8e69c2
am a41fddc6: am 1fcdcc92: (-s ours) Merge "Skip loading keyboard when SoftInputWindow hasn\'t shown yet. (DO NOT MERGE)" into ics-mr1
...
* commit 'a41fddc67668ab85c83dbed40602d2b2a5bd47e5':
Skip loading keyboard when SoftInputWindow hasn't shown yet. (DO NOT MERGE)
2011-11-18 02:42:39 -08:00
a41fddc676
am 1fcdcc92: (-s ours) Merge "Skip loading keyboard when SoftInputWindow hasn\'t shown yet. (DO NOT MERGE)" into ics-mr1
...
* commit '1fcdcc928ba21a7a1a4d3a64c1d1f8fa399099ff':
Skip loading keyboard when SoftInputWindow hasn't shown yet. (DO NOT MERGE)
2011-11-18 02:37:54 -08:00
5619d76584
Shift/Symbol/Smiley will not disable settings/microphone keys
...
Bug: 5560766
Change-Id: Ic2dbb835e87a7debb222093756816e683b464b83
2011-11-17 23:32:19 -08:00
88562bec54
Cleanup.
...
Fix a typo, and move a cursor.close() in a finally{} clause
Change-Id: Iac011ebb80b9430774c7dc5cd94728d05cef443f
2011-11-18 15:24:49 +09:00
10dff76856
Fix NPE introduced by I38b21d49
...
Bug: 5560766
Change-Id: Ic5eaebe0ef893c69ad90a777ebfa07807535a0e3
2011-11-17 21:46:24 -08:00
15a01d7272
Merge "Do not show key preview of settings and shortcut key" into ics-mr1
2011-11-17 18:02:05 -08:00
137667ed3d
Merge "Ignore microphone and settings key while typing" into ics-mr1
2011-11-17 18:01:43 -08:00
1fcdcc928b
Merge "Skip loading keyboard when SoftInputWindow hasn't shown yet. (DO NOT MERGE)" into ics-mr1
2011-11-17 18:00:36 -08:00
175acb8205
Ignore microphone and settings key while typing
...
Bug: 5560766
Change-Id: I38b21d49b7e803bf94805ba8e13849b3c734e010
2011-11-17 16:01:31 -08:00
783d173133
am 7800a313: am b70841f3: am 4c1dfc62: Fix a critical underflow in the touch calibration. This is a cherry-pick of Iacc746e1cc97bf3 Bug: 5629373 Change-Id: Ia198fe5e82b9e7fb801d9bae65cf9c6bbbd1befa
...
* commit '7800a313f10ebeba32864d66edd55e6a5db80114':
Fix a critical underflow in the touch calibration. This is a cherry-pick of Iacc746e1cc97bf3 Bug: 5629373 Change-Id: Ia198fe5e82b9e7fb801d9bae65cf9c6bbbd1befa
2011-11-17 16:00:21 -08:00
7800a313f1
am b70841f3: am 4c1dfc62: Fix a critical underflow in the touch calibration. This is a cherry-pick of Iacc746e1cc97bf3 Bug: 5629373 Change-Id: Ia198fe5e82b9e7fb801d9bae65cf9c6bbbd1befa
...
* commit 'b70841f371e48731732044924b87cd824e327297':
Fix a critical underflow in the touch calibration. This is a cherry-pick of Iacc746e1cc97bf3 Bug: 5629373 Change-Id: Ia198fe5e82b9e7fb801d9bae65cf9c6bbbd1befa
2011-11-17 15:56:30 -08:00
ca14c8bf34
Do not show key preview of settings and shortcut key
...
Bug: 5560766
Change-Id: I580efaf4e33f7dfbaa591e2afae9c49547bf26fb
2011-11-17 15:34:57 -08:00
dc2776f4c3
am 66054717: am 875c16ad: (-s ours) Merge "Fix long press caps lock handling (DO NOT MERGE)" into ics-mr1
...
* commit '660547172e46aa2fa59b22baee13dbddc0c84686':
Fix long press caps lock handling (DO NOT MERGE)
2011-11-17 15:15:23 -08:00
660547172e
am 875c16ad: (-s ours) Merge "Fix long press caps lock handling (DO NOT MERGE)" into ics-mr1
...
* commit '875c16adc3a42b156cc9f215fd6fbaa4e959a905':
Fix long press caps lock handling (DO NOT MERGE)
2011-11-17 15:12:37 -08:00
b70841f371
am 4c1dfc62: Fix a critical underflow in the touch calibration. This is a cherry-pick of Iacc746e1cc97bf3 Bug: 5629373 Change-Id: Ia198fe5e82b9e7fb801d9bae65cf9c6bbbd1befa
...
* commit '4c1dfc62c8d59c7503d3635c96a4c1582f9d9e8a':
Fix a critical underflow in the touch calibration. This is a cherry-pick of Iacc746e1cc97bf3 Bug: 5629373 Change-Id: Ia198fe5e82b9e7fb801d9bae65cf9c6bbbd1befa
2011-11-17 14:49:20 -08:00
60acfdf4a8
Skip loading keyboard when SoftInputWindow hasn't shown yet. (DO NOT MERGE)
...
This is cherry-pick of I003101b2 from Master for Bug: 5541192
Bug: 5636367
Change-Id: I560126d17be6a770b19c1f1347332ebdfde5d671
2011-11-17 14:30:54 -08:00
bd9cf88bef
am 0a663971: am 620b1faf: Merge "Fix the touch calibration bug" into ics-mr1
...
* commit '0a66397106e57165ec8e27a6f868d275da9f3138':
Fix the touch calibration bug
2011-11-17 11:51:55 -08:00
0a66397106
am 620b1faf: Merge "Fix the touch calibration bug" into ics-mr1
...
* commit '620b1faf126d4b5f7cb5c353cebd374d1347fdd4':
Fix the touch calibration bug
2011-11-17 11:46:27 -08:00
875c16adc3
Merge "Fix long press caps lock handling (DO NOT MERGE)" into ics-mr1
2011-11-17 11:18:28 -08:00
f8a97a2552
am ac4bd598: Merge "Fix long press caps lock handling"
...
* commit 'ac4bd598645ff0f12a59e225122ba5fc87e91e8c':
Fix long press caps lock handling
2011-11-17 11:07:18 -08:00
ac4bd59864
Merge "Fix long press caps lock handling"
2011-11-17 11:05:51 -08:00
5ba829ee85
am 245a4d93: am d845c26b: Merge "Fix IndexOutOfBoundsException in monkey test" into ics-mr1
...
* commit '245a4d930430abcc1a9ad4345ccea13c1ac697f2':
Fix IndexOutOfBoundsException in monkey test
2011-11-17 07:52:27 -08:00
245a4d9304
am d845c26b: Merge "Fix IndexOutOfBoundsException in monkey test" into ics-mr1
...
* commit 'd845c26b0e72e67aa14b5eac4616eb5ee7d81b33':
Fix IndexOutOfBoundsException in monkey test
2011-11-17 07:48:20 -08:00
5833ea244a
merge in ics-mr1-release history after reset to ics-mr1
2011-11-17 06:47:26 -08:00
21a97cabf3
am e9984de1: am 6644ea82: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1
...
* commit 'e9984de149a486ec722c4dae83bf67c0979abeff':
Import revised translations. DO NOT MERGE
2011-11-17 05:55:05 -08:00
e9984de149
am 6644ea82: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1
...
* commit '6644ea82970da35897b40ef524406b1e3b0d0a9d':
Import revised translations. DO NOT MERGE
2011-11-17 05:46:23 -08:00
3a1a5a25a2
am 6e8f277a: am 0993a89b: am 1c0f94c5: Reconcile with ics-factoryrom-2-release
...
* commit '6e8f277aab617b849c49f39e8496f9bb34f5ec4a':
2011-11-17 04:13:04 -08:00
6e8f277aab
am 0993a89b: am 1c0f94c5: Reconcile with ics-factoryrom-2-release
...
* commit '0993a89b31eea938b72b925d078f5c68322885f8':
2011-11-17 04:08:35 -08:00
4c1dfc62c8
Fix a critical underflow in the touch calibration. This is a cherry-pick of Iacc746e1cc97bf3
...
Bug: 5629373
Change-Id: Ia198fe5e82b9e7fb801d9bae65cf9c6bbbd1befa
2011-11-17 16:34:05 +09:00
620b1faf12
Merge "Fix the touch calibration bug" into ics-mr1
2011-11-16 23:23:52 -08:00
554fdd21a1
Fix the touch calibration bug
...
Bug: 5629373
Change-Id: Iacc746e1cc97bf305e1f287cf7431b7115607eeb
2011-11-17 15:56:41 +09:00
d845c26b0e
Merge "Fix IndexOutOfBoundsException in monkey test" into ics-mr1
2011-11-16 17:45:09 -08:00
628ca7a854
Fix long press caps lock handling (DO NOT MERGE)
...
This is cherry-pick of I3850f283.
Bug: 5627467
Change-Id: If46dcbe5bac42b975bd001fefb9f11520a0abb70
2011-11-16 16:50:44 -08:00
42e8c64a04
Fix long press caps lock handling
...
Bug: 5627467
Change-Id: I3850f283d44da81ecb22fc4e6d8aa574f5fcf65f
2011-11-16 16:50:03 -08:00
d17786fcd2
Fix IndexOutOfBoundsException in monkey test
...
Bug: 5627027
Change-Id: I341cfa5c3d553a1c819d8455936b40a40ad30e87
2011-11-16 15:53:03 -08:00
6644ea8297
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
2011-11-16 13:27:11 -08:00
168d689ec6
Import revised translations. DO NOT MERGE
...
Change-Id: I9e72643726caf00d8e1acd98d9843576c15f39be
2011-11-16 13:08:54 -08:00
0993a89b31
am 1c0f94c5: Reconcile with ics-factoryrom-2-release
...
* commit '1c0f94c5916921ee861933e080d7b0f711b019e1':
2011-11-16 09:36:12 -08:00
1c0f94c591
Reconcile with ics-factoryrom-2-release
...
Change-Id: Ie0c40f94cf560dbe14a334d2e177e4e4a9d32eb7
2011-11-16 08:56:47 -08:00
b21a1f4158
am 9b4d3cb3: am 25cbe892: Reconcile with ics-factoryrom-2-release
...
* commit '9b4d3cb3a47bcad973165fdd888306b3c80c66b0':
Fix a bug that would end up in memory corruption
2011-11-16 07:45:53 -08:00
9b4d3cb3a4
am 25cbe892: Reconcile with ics-factoryrom-2-release
...
* commit '25cbe8924a7ec5c45914c8818b5ad7b39e1f6103':
Fix a bug that would end up in memory corruption
2011-11-16 07:42:15 -08:00
25cbe8924a
Reconcile with ics-factoryrom-2-release
...
Change-Id: I9bf189bb9a5349fe01657e1981f075370d6ed4e7
2011-11-16 07:34:46 -08:00
3cc1e9e91d
merge in ics-mr1-release history after reset to ics-mr1
2011-11-16 06:47:03 -08:00
b2e6370aa1
am eb520c56: am 549e295d: Fix updateFullscreenMode of LatinIME
...
* commit 'eb520c568365d690da4347c787a8c44708b52e50':
Fix updateFullscreenMode of LatinIME
2011-11-15 18:30:09 -08:00
eb520c5683
am 549e295d: Fix updateFullscreenMode of LatinIME
...
* commit '549e295dc113bff50077c3c355dcd94af09a1b2f':
Fix updateFullscreenMode of LatinIME
2011-11-15 18:25:21 -08:00
549e295dc1
Fix updateFullscreenMode of LatinIME
...
Bug: 5597608
Change-Id: If4b18dc933493bd74bc5506c028af86b0450df1f
2011-11-15 15:15:11 -08:00
7c2cb3eb06
am ed631627: Double space conversion should be enabled only when the 1st space is "weak".
...
* commit 'ed631627cb2337b025f0e80df6fecf1e6e511dc4':
Double space conversion should be enabled only when the 1st space is "weak".
2011-11-15 04:12:05 -08:00
ed631627cb
Double space conversion should be enabled only when the 1st space is "weak".
...
bug: 5608934
Change-Id: Ide7ca9d526620c4f225a6f5eb27dcd7df5b504bd
2011-11-15 12:35:22 +09:00
Tadashi G. Takaoka
Jean Chalard
satok
The Android Automerger
Eric Fischer
The Android Open Source Project
Ken Wakasa