Jeff Brown
22f5ee9374
am 36f0cb26: am 8d60866e: Input device calibration and capabilities.
...
Merge commit '36f0cb26cbb4ef62995ff2e5a540cf8814e7f030'
* commit '36f0cb26cbb4ef62995ff2e5a540cf8814e7f030':
Input device calibration and capabilities.
2010-08-30 18:29:12 -07:00
Brad Fitzpatrick
02f4f0eb49
am 734d2707: am bb660d7e: Merge "Renaming SharedPreferences.startCommit to apply" into gingerbread
...
Merge commit '734d270769c609c7d3a1f2ec46e1d329d9682ab4'
* commit '734d270769c609c7d3a1f2ec46e1d329d9682ab4':
Renaming SharedPreferences$Editor.startCommit to apply
2010-08-30 18:25:02 -07:00
Jeff Brown
36f0cb26cb
am 8d60866e: Input device calibration and capabilities.
...
Merge commit '8d60866e2100db70ecf0502c14768a384514d7e9' into gingerbread-plus-aosp
* commit '8d60866e2100db70ecf0502c14768a384514d7e9':
Input device calibration and capabilities.
2010-08-30 18:22:32 -07:00
Brad Fitzpatrick
734d270769
am bb660d7e: Merge "Renaming SharedPreferences.startCommit to apply" into gingerbread
...
Merge commit 'bb660d7e1bed3a07a1804bd9641d9634bfaa4972' into gingerbread-plus-aosp
* commit 'bb660d7e1bed3a07a1804bd9641d9634bfaa4972':
Renaming SharedPreferences$Editor.startCommit to apply
2010-08-30 18:18:54 -07:00
Jeff Brown
8d60866e21
Input device calibration and capabilities.
...
Finished the input device capability API.
Added a mechanism for calibrating touch devices to obtain more
accurate information about the touch contact area.
Improved pointer location to show new coordinates and capabilities.
Optimized pointer location display and formatting to avoid allocating large
numbers of temporary objects. The GC churn was causing the application to
stutter very badly when more than a couple of fingers were down).
Added more diagnostics.
Change-Id: Ie25380278ed6f16c5b04cd9df848015850383498
2010-08-30 18:16:43 -07:00
Brad Fitzpatrick
bb660d7e1b
Merge "Renaming SharedPreferences$Editor.startCommit to apply" into gingerbread
2010-08-30 18:14:44 -07:00
Brad Fitzpatrick
66fce5068a
Renaming SharedPreferences$Editor.startCommit to apply
...
Also removes the artifical restriction that only one apply() can be in
flight at once. That was old from when I thought it'd end up being
required, but wasn't.
Change-Id: I3540ea8be6e0760d6a51d218186f71655c2f3f55
2010-08-30 18:10:49 -07:00
Jim Miller
91b2eb933c
Merge "Fix 2797185: Add recents to statusbar on xlarge device."
2010-08-30 18:04:30 -07:00
Jim Miller
a10194936c
Fix 2797185: Add recents to statusbar on xlarge device.
...
Change-Id: I9d2b099347b31189b96596273e38b5c2df8f4432
2010-08-30 17:54:42 -07:00
Dmitri Plotnikov
bcc2f7589a
Merge "Added new method to format the phone number when neccessary."
2010-08-30 17:48:05 -07:00
Daniel Sandler
8b46add1d5
Merge "Turn off spammy RSSI logs."
2010-08-30 17:47:56 -07:00
Andreas Huber
47416bc4f9
am 03e83d4a: am 68ae91cb: Merge "Recent changes to the rtsp code require every buffer fed to the packet source to have a timestamp, we\'re ignoring timestamps for gtalk videochat but we still have to have a placeholder." into gingerbread
...
Merge commit '03e83d4ad909f5c07fb2011e03348a413453e909'
* commit '03e83d4ad909f5c07fb2011e03348a413453e909':
Recent changes to the rtsp code require every buffer fed to the packet source to have a timestamp, we're ignoring timestamps for gtalk videochat but we still have to have a placeholder.
2010-08-30 16:19:55 -07:00
Andreas Huber
03e83d4ad9
am 68ae91cb: Merge "Recent changes to the rtsp code require every buffer fed to the packet source to have a timestamp, we\'re ignoring timestamps for gtalk videochat but we still have to have a placeholder." into gingerbread
...
Merge commit '68ae91cbd20939e48ad15c15405048e7ff9fe2f8' into gingerbread-plus-aosp
* commit '68ae91cbd20939e48ad15c15405048e7ff9fe2f8':
Recent changes to the rtsp code require every buffer fed to the packet source to have a timestamp, we're ignoring timestamps for gtalk videochat but we still have to have a placeholder.
2010-08-30 16:16:03 -07:00
Andreas Huber
68ae91cbd2
Merge "Recent changes to the rtsp code require every buffer fed to the packet source to have a timestamp, we're ignoring timestamps for gtalk videochat but we still have to have a placeholder." into gingerbread
2010-08-30 16:12:46 -07:00
Andreas Huber
0ddf8c09f9
Recent changes to the rtsp code require every buffer fed to the packet source to have a timestamp, we're ignoring timestamps for gtalk videochat but we still have to have a placeholder.
...
Change-Id: Ib8615ce5a89a9a846ee2f9f96cdfb23462f72c7a
2010-08-30 16:08:03 -07:00
Andreas Huber
6924563868
am 987556bc: am abb8398e: Merge "Instead of closing the connection altogether if no UDP packets arrive after a certain time, try changing transports (to interleaved TCP). Also properly close the sockets on disconnection." into gingerbread
...
Merge commit '987556bc9bc1a61415b6e65bd600b8daf5b24d30'
* commit '987556bc9bc1a61415b6e65bd600b8daf5b24d30':
Instead of closing the connection altogether if no UDP packets arrive after a certain time, try changing transports (to interleaved TCP). Also properly close the sockets on disconnection.
2010-08-30 16:02:26 -07:00
Robert Greenwalt
37e65ebb7e
Rename NetworkProperties to LinkProperties
...
Also add copy constructors and use them when giving out data.
Change-Id: Id320eb8fb91d0bd250305ce7bb4f628570215615
2010-08-30 15:54:37 -07:00
Andreas Huber
987556bc9b
am abb8398e: Merge "Instead of closing the connection altogether if no UDP packets arrive after a certain time, try changing transports (to interleaved TCP). Also properly close the sockets on disconnection." into gingerbread
...
Merge commit 'abb8398e5ab40a3078902c5333126a0743ba2458' into gingerbread-plus-aosp
* commit 'abb8398e5ab40a3078902c5333126a0743ba2458':
Instead of closing the connection altogether if no UDP packets arrive after a certain time, try changing transports (to interleaved TCP). Also properly close the sockets on disconnection.
2010-08-30 15:46:58 -07:00
Andreas Huber
abb8398e5a
Merge "Instead of closing the connection altogether if no UDP packets arrive after a certain time, try changing transports (to interleaved TCP). Also properly close the sockets on disconnection." into gingerbread
2010-08-30 15:43:41 -07:00
Mattias Falk
e82235ae70
am 4076d4f8: am 12dbee82: Avoid NullPointerException in BrowserFrame
...
Merge commit '4076d4f887097f3e6d2f1f3863172507629db0b9'
* commit '4076d4f887097f3e6d2f1f3863172507629db0b9':
Avoid NullPointerException in BrowserFrame
2010-08-30 15:27:16 -07:00
Jean-Baptiste Queru
4361fb512f
am 86aeac98: am 1d22e122: Merge "Fix a monkey crash when the new WebView is destroyed."
...
Merge commit '86aeac9844f1cb4d07c53c581bca4d9b8377b354'
* commit '86aeac9844f1cb4d07c53c581bca4d9b8377b354':
Fix a monkey crash when the new WebView is destroyed.
2010-08-30 15:27:10 -07:00
Andreas Huber
f88ca7a033
Instead of closing the connection altogether if no UDP packets arrive after a certain time, try changing transports (to interleaved TCP). Also properly close the sockets on disconnection.
...
Change-Id: Ie8d6a3865a0477e28d4b76bb9038e468451287b1
related-to-bug: 2556656
2010-08-30 15:25:35 -07:00
Kenny Root
6c8beb0cb4
am 8a5ab396: am 2e86809b: Merge "Native libraries on SD" into gingerbread
...
Merge commit '8a5ab396cf4f3bb76a3e820f16f946e313b73fcf'
* commit '8a5ab396cf4f3bb76a3e820f16f946e313b73fcf':
Native libraries on SD
2010-08-30 15:24:45 -07:00
Mattias Falk
4076d4f887
am 12dbee82: Avoid NullPointerException in BrowserFrame
...
Merge commit '12dbee827353ecdb690d27c3f52e26afc71e0774' into gingerbread-plus-aosp
* commit '12dbee827353ecdb690d27c3f52e26afc71e0774':
Avoid NullPointerException in BrowserFrame
2010-08-30 15:21:55 -07:00
Jean-Baptiste Queru
86aeac9844
am 1d22e122: Merge "Fix a monkey crash when the new WebView is destroyed."
...
Merge commit '1d22e122a6f278a432519673a8ad3e4853934461' into gingerbread-plus-aosp
* commit '1d22e122a6f278a432519673a8ad3e4853934461':
Fix a monkey crash when the new WebView is destroyed.
2010-08-30 15:21:51 -07:00
Kenny Root
8a5ab396cf
am 2e86809b: Merge "Native libraries on SD" into gingerbread
...
Merge commit '2e86809b6c79375d23c0975914efc3b66e89ac90' into gingerbread-plus-aosp
* commit '2e86809b6c79375d23c0975914efc3b66e89ac90':
Native libraries on SD
2010-08-30 15:21:17 -07:00
Kenny Root
2e86809b6c
Merge "Native libraries on SD" into gingerbread
2010-08-30 15:16:10 -07:00
Kenny Root
0ac83f5a7c
Native libraries on SD
...
* Add native library tests during package move
* Fix omission that let PackageSettings and ApplicationInfo get out of
sync.
Change-Id: Ic4958f971cb2c9cfd270522fdc120b4031c1124a
2010-08-30 15:14:06 -07:00
Mattias Falk
12dbee8273
Avoid NullPointerException in BrowserFrame
...
Avoid NullPointerException in BrowserFrame in
method createWindow. getWebViewCore can return
null if WebView has been destroyed. Crash found
in live environment.
Change-Id: I49c3549a037d8f424a0abaee1f8933974b1ec9d7
2010-08-30 15:10:55 -07:00
Eric Laurent
2ed7818129
am 44217848: am ae6bdc23: Merge "Fix issue 2952766." into gingerbread
...
Merge commit '4421784895a58bb7bcf90236a9e443b372b5b80e'
* commit '4421784895a58bb7bcf90236a9e443b372b5b80e':
Fix issue 2952766.
2010-08-30 15:07:45 -07:00
Eric Laurent
4421784895
am ae6bdc23: Merge "Fix issue 2952766." into gingerbread
...
Merge commit 'ae6bdc23bd3fc74416985b93c995c54ea588d349' into gingerbread-plus-aosp
* commit 'ae6bdc23bd3fc74416985b93c995c54ea588d349':
Fix issue 2952766.
2010-08-30 15:04:48 -07:00
Jean-Baptiste Queru
1d22e122a6
Merge "Fix a monkey crash when the new WebView is destroyed."
2010-08-30 15:03:06 -07:00
Eric Laurent
ae6bdc23bd
Merge "Fix issue 2952766." into gingerbread
2010-08-30 15:02:06 -07:00
Gloria Wang
9bc4dbb377
Merge "Fix for "@param tag with name that doesn't match the parameter list: 'fileStream'""
2010-08-30 14:43:11 -07:00
Gloria Wang
45bc5eca2b
Fix for "@param tag with name that doesn't match the parameter list: 'fileStream'"
...
Change-Id: Id98df7dcdfa4119783fca6cb5478df5b99050738
2010-08-30 14:29:31 -07:00
Eric Fischer
8c55d4791b
Merge "Import revised translations"
2010-08-30 14:20:05 -07:00
Wu-cheng Li
b8f7f42f70
am 6e46e6f7: am 7ec7b997: Remove camera metering mode API.
...
Merge commit '6e46e6f7488ad1f4e6ab762d141790798fe3f2d5'
* commit '6e46e6f7488ad1f4e6ab762d141790798fe3f2d5':
Remove camera metering mode API.
2010-08-30 14:06:16 -07:00
Jean-Baptiste Queru
1ace4163fa
resolved conflicts for merge of ff749b9a to master
...
Change-Id: Ieb368754b84a47179b75cbae8fcd7d971893b7af
2010-08-30 14:00:27 -07:00
Wu-cheng Li
6e46e6f748
am 7ec7b997: Remove camera metering mode API.
...
Merge commit '7ec7b9970cc3a6311bf043e228991adf24c43523' into gingerbread-plus-aosp
* commit '7ec7b9970cc3a6311bf043e228991adf24c43523':
Remove camera metering mode API.
2010-08-30 13:48:07 -07:00
Jean-Baptiste Queru
9ef658ddda
am 9773cd73: (-s ours) am f470ed86: Merge "Support surrogate pairs when layouting text"
...
Merge commit '9773cd73b627c8521257c005881554d183d19a63'
* commit '9773cd73b627c8521257c005881554d183d19a63':
Support surrogate pairs when layouting text
2010-08-30 13:47:37 -07:00
Joe Onorato
c1e02b9f1f
Merge "Add another pass of the docs that nothing depends on that tries to parse some of the docs but without generating all of them."
2010-08-30 13:34:55 -07:00
Wu-cheng Li
7ec7b9970c
Remove camera metering mode API.
...
Metering mode is not supported yet.
Change-Id: Id6906d6ab0cd1a9dcbc5c303d8d5081b2cda699e
2010-08-30 13:33:53 -07:00
Joe Onorato
4314e2e674
Add another pass of the docs that nothing depends on that tries to parse some of the docs but
...
without generating all of them.
This should cut down on the number of sdk breakages.
Change-Id: I947cc346bc525b05cc064c102171c4004303d7ed
2010-08-30 13:33:51 -07:00
Eric Fischer
aa2aaf344f
Import revised translations
...
Change-Id: I51d0b3da80886dbcbd0774af896a8727c9a6f84c
2010-08-30 13:31:13 -07:00
Andreas Huber
2527da00e2
am 9aa05ec2: am 681c5ff2: Merge "Reverse the default setting of media.stagefright.enable-{rtsp,record} in preparation for building without opencore." into gingerbread
...
Merge commit '9aa05ec2cd6bc592074c7bd08d22db46649c7f12'
* commit '9aa05ec2cd6bc592074c7bd08d22db46649c7f12':
Reverse the default setting of media.stagefright.enable-{rtsp,record} in preparation for building without opencore.
2010-08-30 13:30:35 -07:00
Eric Laurent
9d01dcbdf2
am 5762dc19: am 858bb4f6: Merge "LVM release 1.07 delivery." into gingerbread
...
Merge commit '5762dc19836e332d3ac1906e5698088a128b362d'
* commit '5762dc19836e332d3ac1906e5698088a128b362d':
LVM release 1.07 delivery.
2010-08-30 13:30:14 -07:00
Eric Rowe
8e1bc8c508
am 6151a9ef: (-s ours) am f72b0e44: Merge "DO NOT MERGE Add A2DP and Headset connection stress tests." into gingerbread
...
Merge commit '6151a9ef232b9d4d2b38761159f49181679a6a17'
* commit '6151a9ef232b9d4d2b38761159f49181679a6a17':
DO NOT MERGE Add A2DP and Headset connection stress tests.
2010-08-30 13:30:10 -07:00
Andreas Huber
3678668997
am 7ed9104c: am f6639c46: Finetune some rtsp timeout constants.
...
Merge commit '7ed9104c3acb172a480ebd7fd456fe69efd1ec3d'
* commit '7ed9104c3acb172a480ebd7fd456fe69efd1ec3d':
Finetune some rtsp timeout constants.
2010-08-30 13:30:05 -07:00
Eric Fischer
5366f26cdb
am a7dae24c: (-s ours) am 01ee34d7: Merge "Import revised translations. DO NOT MERGE" into gingerbread
...
Merge commit 'a7dae24ccde658d8da00e9b738ba334704dca1e8'
* commit 'a7dae24ccde658d8da00e9b738ba334704dca1e8':
Import revised translations. DO NOT MERGE
2010-08-30 13:29:57 -07:00
Andreas Huber
631025eec0
am 6df6d606: am df992ac9: Merge "ALoopers can now be named (useful to distinguish threads)." into gingerbread
...
Merge commit '6df6d60681be9d524ce7fc07f2511008de424d27'
* commit '6df6d60681be9d524ce7fc07f2511008de424d27':
ALoopers can now be named (useful to distinguish threads).
2010-08-30 13:29:51 -07:00