Commit Graph

26224 Commits

Author SHA1 Message Date
Joe Onorato
b1824cfca7 am 54901c9e: fix the build. will revisit this change in a minute
Merge commit '54901c9e8497b33bab1462245864e9dd119bb64c' into gingerbread-plus-aosp

* commit '54901c9e8497b33bab1462245864e9dd119bb64c':
  fix the build.  will revisit this change in a minute
2010-08-31 13:25:27 -07:00
Joe Onorato
5238c5f9a5 fix the build. will revisit this change in a minute
Change-Id: Ibac9e777ea7332d63ddaf2e3b8935e56a663ebbe
2010-08-31 13:00:51 -07:00
Joe Onorato
54901c9e84 fix the build. will revisit this change in a minute
Change-Id: Ibac9e777ea7332d63ddaf2e3b8935e56a663ebbe
2010-08-31 12:53:18 -07:00
Jean-Baptiste Queru
d6a5f2dff9 am d3e803ae: Revert "Shutdown when capacity is 0% and no charging or when battery is dead"
Merge commit 'd3e803ae28c369996f9acf6036ea99af5561949c' into gingerbread-plus-aosp

* commit 'd3e803ae28c369996f9acf6036ea99af5561949c':
  Revert "Shutdown when capacity is 0% and no charging or when battery is dead"
2010-08-31 12:45:02 -07:00
Jean-Baptiste Queru
d3e803ae28 Revert "Shutdown when capacity is 0% and no charging or when battery is dead"
This reverts commit fd04143a47.

This break most automated tests because with this change, if the
device is fully charged, it will simply turn off the screen, regardless
if USB is connected to hsot PC or not; so for our tests, most of them
are always connected to host PC, and fully charged 99% of the time,
as soon as the screen turns off, the front-end test Activity will be
suspended.

Change-Id: I1e6590611af43812f1bac223dd31570d1d90cfc5
2010-08-31 12:32:55 -07:00
Joe Onorato
18551815e5 am 77881293: DO NOT MERGE - Back port change from master that enforces correctness in the javadoc comments.
Merge commit '77881293ad9a68dfa1c1da4b466f7b2b6465b342' into gingerbread-plus-aosp

* commit '77881293ad9a68dfa1c1da4b466f7b2b6465b342':
  DO NOT MERGE - Back port change from master that enforces correctness in the javadoc comments.
2010-08-31 12:12:27 -07:00
Joe Onorato
77881293ad DO NOT MERGE - Back port change from master that enforces correctness in the javadoc comments.
Change-Id: I42956ccb3a32b3bd7c573bb2175e4ec230613dbf
2010-08-31 12:00:03 -07:00
Jeff Brown
be990e97a9 am 6eb5ac9c: Fix doc link in InputDevice.
Merge commit '6eb5ac9ceeb3ff67d38c7ead54b4247e762f278d' into gingerbread-plus-aosp

* commit '6eb5ac9ceeb3ff67d38c7ead54b4247e762f278d':
  Fix doc link in InputDevice.
2010-08-30 23:32:40 -07:00
Jeff Brown
6eb5ac9cee Fix doc link in InputDevice.
Change-Id: I3b356b8e3803661ccfe5bb4812021b6c6d576d21
2010-08-30 23:29:07 -07:00
Chia-chi Yeh
1577e62986 am 12006013: fixedfft: Only includes cpu-features.h when __arm__ is defined.
Merge commit '12006013cc2cd0a076855ed068f5f782b24631c3' into gingerbread-plus-aosp

* commit '12006013cc2cd0a076855ed068f5f782b24631c3':
  fixedfft: Only includes cpu-features.h when __arm__ is defined.
2010-08-30 22:06:39 -07:00
Chia-chi Yeh
12006013cc fixedfft: Only includes cpu-features.h when __arm__ is defined.
Change-Id: Ifb6c03b38eff3c94a507ceb5043fcc48b364c25c
2010-08-31 12:56:01 +08:00
Adam Powell
a9c43aaa44 am 0a77ce27: New edge effects for scrolling widgets (overscroll)
Merge commit '0a77ce277c6ed2aa25bbea5f8cd5687c0720cb68' into gingerbread-plus-aosp

* commit '0a77ce277c6ed2aa25bbea5f8cd5687c0720cb68':
  New edge effects for scrolling widgets (overscroll)
2010-08-30 19:19:37 -07:00
Adam Powell
0a77ce277c New edge effects for scrolling widgets (overscroll)
TODO: Currently disabled for WebView. Assets used for the glow effect
need to be themable/styleable. Overscroll effect should take place
even when the user did not grab the widget within actual content.

Change-Id: I68277d14d37dc5bcdb9254eaddf6e4998b3f2bf4
2010-08-30 19:14:07 -07:00
Adam Powell
7d04f2bc4e am 4c72ad75: Merge "Fix bug 2918587 Infinite loop and memory leak in AdapterView" into gingerbread
Merge commit '4c72ad75cfb413f54cb59d413a232e77c7260ef2' into gingerbread-plus-aosp

* commit '4c72ad75cfb413f54cb59d413a232e77c7260ef2':
  Fix bug 2918587 Infinite loop and memory leak in AdapterView
2010-08-30 18:35:58 -07:00
Adam Powell
4c72ad75cf Merge "Fix bug 2918587 Infinite loop and memory leak in AdapterView" into gingerbread 2010-08-30 18:33:20 -07:00
Adam Powell
9c17a4c110 Fix bug 2918587 Infinite loop and memory leak in AdapterView
Change-Id: Icb63b186c56c2d731003dc38a8ff7a93a69a94e7
2010-08-30 18:23:26 -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
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
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
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
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
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
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
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
Jean-Baptiste Queru
ff749b9a0d am 55a2df8c: Merge "Telephony: Control operator selection using EF_CSP data."
Merge commit '55a2df8c773f2b0af02d0a47fa5be4f14fcbf419' into gingerbread-plus-aosp

* commit '55a2df8c773f2b0af02d0a47fa5be4f14fcbf419':
  Telephony: Control operator selection using EF_CSP data.
2010-08-30 13:20:57 -07:00
Jean-Baptiste Queru
9773cd73b6 am f470ed86: Merge "Support surrogate pairs when layouting text"
Merge commit 'f470ed8630e9e648727443b065b9f1c69fee34d6' into gingerbread-plus-aosp

* commit 'f470ed8630e9e648727443b065b9f1c69fee34d6':
  Support surrogate pairs when layouting text
2010-08-30 13:20:41 -07:00
Andreas Huber
9aa05ec2cd am 681c5ff2: Merge "Reverse the default setting of media.stagefright.enable-{rtsp,record} in preparation for building without opencore." into gingerbread
Merge commit '681c5ff2085a08835c08b97641ebdc1b37489943' into gingerbread-plus-aosp

* commit '681c5ff2085a08835c08b97641ebdc1b37489943':
  Reverse the default setting of media.stagefright.enable-{rtsp,record} in preparation for building without opencore.
2010-08-30 13:06:55 -07:00
Andreas Huber
681c5ff208 Merge "Reverse the default setting of media.stagefright.enable-{rtsp,record} in preparation for building without opencore." into gingerbread 2010-08-30 13:04:21 -07:00
Jean-Baptiste Queru
55a2df8c77 Merge "Telephony: Control operator selection using EF_CSP data." 2010-08-30 13:00:48 -07:00
Andreas Huber
30cfa20dfc Reverse the default setting of media.stagefright.enable-{rtsp,record} in preparation for building without opencore.
Change-Id: I1ca6bd8faba0185f9694f9dc04d2b3e6a7ab5ac3
related-to-bug: 2370115
2010-08-30 12:46:12 -07:00
Eric Laurent
5762dc1983 am 858bb4f6: Merge "LVM release 1.07 delivery." into gingerbread
Merge commit '858bb4f66ea1bd9c48b9817cb44a59c8b0394229' into gingerbread-plus-aosp

* commit '858bb4f66ea1bd9c48b9817cb44a59c8b0394229':
  LVM release 1.07 delivery.
2010-08-30 12:33:56 -07:00
Eric Rowe
6151a9ef23 am f72b0e44: Merge "DO NOT MERGE Add A2DP and Headset connection stress tests." into gingerbread
Merge commit 'f72b0e447296bc07104af62c33c56bc15b7a6677' into gingerbread-plus-aosp

* commit 'f72b0e447296bc07104af62c33c56bc15b7a6677':
  DO NOT MERGE Add A2DP and Headset connection stress tests.
2010-08-30 12:33:52 -07:00
Andreas Huber
7ed9104c3a am f6639c46: Finetune some rtsp timeout constants.
Merge commit 'f6639c46e83a1ccab7b293192c208091d17c61be' into gingerbread-plus-aosp

* commit 'f6639c46e83a1ccab7b293192c208091d17c61be':
  Finetune some rtsp timeout constants.
2010-08-30 12:33:25 -07:00
Eric Fischer
a7dae24ccd am 01ee34d7: Merge "Import revised translations. DO NOT MERGE" into gingerbread
Merge commit '01ee34d7078afcf4d938d4c3ea29a4b9fdcc02f8' into gingerbread-plus-aosp

* commit '01ee34d7078afcf4d938d4c3ea29a4b9fdcc02f8':
  Import revised translations.  DO NOT MERGE
2010-08-30 12:33:19 -07:00
Andreas Huber
6df6d60681 am df992ac9: Merge "ALoopers can now be named (useful to distinguish threads)." into gingerbread
Merge commit 'df992ac9cc54cedb3e384617ed683a2d1a24d38b' into gingerbread-plus-aosp

* commit 'df992ac9cc54cedb3e384617ed683a2d1a24d38b':
  ALoopers can now be named (useful to distinguish threads).
2010-08-30 12:33:08 -07:00
Eric Laurent
858bb4f66e Merge "LVM release 1.07 delivery." into gingerbread 2010-08-30 11:39:34 -07:00