OSDN Git Service
Amith Yamasani [Thu, 10 Dec 2009 15:53:58 +0000 (07:53 -0800)]
am
774568f7: am
1ee7b645: Merge change I0743a389 into eclair-mr2
Merge commit '
774568f73911ae2bb35c816a40d49376ea8300df'
* commit '
774568f73911ae2bb35c816a40d49376ea8300df':
Close popup when Keyboard gets a CANCEL motion event.
Christopher Tate [Thu, 10 Dec 2009 15:53:40 +0000 (07:53 -0800)]
am
3a0a9e25: am
a5ba0a78: am
767eb427: Merge change If990cab0 into eclair
Merge commit '
3a0a9e25a8331e4fb7ea3b7bf7a436db1a155523'
* commit '
3a0a9e25a8331e4fb7ea3b7bf7a436db1a155523':
Make sure to acknowledge stale broadcasts
Joe Onorato [Thu, 10 Dec 2009 15:53:22 +0000 (07:53 -0800)]
am
c97c5c0b: am
b43b5def: am
0d8055e5: Paper over
2275704 by not having LotsOfApps installed on the monkeys builds.
Merge commit '
c97c5c0b9b61f48cbf47cb95d497e0bb6d01eeef'
* commit '
c97c5c0b9b61f48cbf47cb95d497e0bb6d01eeef':
Paper over
2275704 by not having LotsOfApps installed on the monkeys builds.
Grace Kloba [Thu, 10 Dec 2009 15:53:03 +0000 (07:53 -0800)]
am
506afbd6: am
3f40bd48: Remove the code where we suspect webkit draw during drag. It was added for the better performance of panning while loading. But it does make sites using touch event look bad as we don\'t have the display tree until touch up.
Merge commit '
506afbd600d82a324f59ceb875f664ead4338600'
* commit '
506afbd600d82a324f59ceb875f664ead4338600':
Remove the code where we suspect webkit draw during
Jean-Baptiste Queru [Thu, 10 Dec 2009 15:48:35 +0000 (07:48 -0800)]
resolved conflicts for merge of
cd6e3484 to master
Kenny Root [Thu, 10 Dec 2009 15:06:45 +0000 (07:06 -0800)]
am
5cd6fcd5: am
e6c0e993: Merge change I129483f8 into eclair-mr2
Merge commit '
5cd6fcd518d47d1974a10fccf3c3d5431a83307a'
* commit '
5cd6fcd518d47d1974a10fccf3c3d5431a83307a':
Optional use of UTF-8 strings in resource bundles
Ken Shirriff [Thu, 10 Dec 2009 15:06:25 +0000 (07:06 -0800)]
am
d44c2f2c: am
1270e2e2: Merge change I96ddd6e2 into eclair-mr2
Merge commit '
d44c2f2c85c8720763837b89a8988b6e5cc248bf'
* commit '
d44c2f2c85c8720763837b89a8988b6e5cc248bf':
Migration to TrafficStats.
Bjorn Bringert [Thu, 10 Dec 2009 15:06:00 +0000 (07:06 -0800)]
am
c99f154b: am
dcd8bad3: Merge change Ia28d9547 into eclair-mr2
Merge commit '
c99f154b549ff0bae84b082dc4d80351b341494e'
* commit '
c99f154b549ff0bae84b082dc4d80351b341494e':
Expose SearchableInfo and getSearchablesInGlobalSearch()
Romain Guy [Thu, 10 Dec 2009 15:05:39 +0000 (07:05 -0800)]
am
8f4bca2a: am
06ffc12a: Merge change I237c1cee into eclair-mr2
Merge commit '
8f4bca2acada86c36c7de59e8891ef120098aa19'
* commit '
8f4bca2acada86c36c7de59e8891ef120098aa19':
Improve exception message thrown when a View's state is of the wrong type.
Dianne Hackborn [Thu, 10 Dec 2009 15:05:18 +0000 (07:05 -0800)]
am
68a3b8b6: am
24eca800: Merge change I887f355f into eclair-mr2
Merge commit '
68a3b8b66044d0a9fa901ad306fc6db6d13f94d3'
* commit '
68a3b8b66044d0a9fa901ad306fc6db6d13f94d3':
Propagate background scheduling class across processes.
Leon Scroggins [Thu, 10 Dec 2009 15:04:57 +0000 (07:04 -0800)]
am
9f1ea0d4: am
6be3bf23: Some fixes for positioning the WebTextView.
Merge commit '
9f1ea0d47f5aa18cf949593e6bfd36af9c6a55be'
* commit '
9f1ea0d47f5aa18cf949593e6bfd36af9c6a55be':
Some fixes for positioning the WebTextView.
Ken Shirriff [Thu, 10 Dec 2009 15:04:31 +0000 (07:04 -0800)]
am
0e933c85: am
f7d0b013: Add TrafficStats class to SDK.
Merge commit '
0e933c853ad53037631e5bca5b4a46f056c1e538'
* commit '
0e933c853ad53037631e5bca5b4a46f056c1e538':
Add TrafficStats class to SDK.
Andreas Huber [Thu, 10 Dec 2009 15:04:09 +0000 (07:04 -0800)]
am
30807a45: am
7c55c3f5: Make sure to use the hand-tweaked-assembly version of the relevant mp3 code if building for ARM.
Merge commit '
30807a4500fab8b46ee661db2ba99286049a8adc'
* commit '
30807a4500fab8b46ee661db2ba99286049a8adc':
Make sure to use the hand-tweaked-assembly version of the relevant mp3 code if building for ARM.
Andreas Huber [Thu, 10 Dec 2009 15:03:47 +0000 (07:03 -0800)]
am
b16cf676: am
6d35d4c2: Merge change Ib16e5543 into eclair-mr2
Merge commit '
b16cf676bd3304bc0c5da4210d689f4e680219b1'
* commit '
b16cf676bd3304bc0c5da4210d689f4e680219b1':
Fix the mp3 audio extractor that would occasionally return an invalid frame directly after a seek.
Andreas Huber [Thu, 10 Dec 2009 15:03:19 +0000 (07:03 -0800)]
am
a42b8f16: am
3f5b2867: Merge change I8f658214 into eclair-mr2
Merge commit '
a42b8f160fb5906638e978a470972d1f50d749ac'
* commit '
a42b8f160fb5906638e978a470972d1f50d749ac':
Minor tweaks to the mp3 and aac software decoders, propagate duration to output format.
Andreas Huber [Thu, 10 Dec 2009 15:02:53 +0000 (07:02 -0800)]
am
42be7440: am
ee3a2443: Merge change Ic532c956 into eclair-mr2
Merge commit '
42be7440ee2a3a360c83802e4e7a2ecf40220eff'
* commit '
42be7440ee2a3a360c83802e4e7a2ecf40220eff':
Note to self: Don't reverse the arguments to fseek(o)...
Daniel Sandler [Thu, 10 Dec 2009 15:02:30 +0000 (07:02 -0800)]
am
f43eeef3: am
10c1dfad: Merge change Ifea65fb9 into eclair-mr2
Merge commit '
f43eeef301cb5a0c24c95ffa0425fcabda905b8d'
* commit '
f43eeef301cb5a0c24c95ffa0425fcabda905b8d':
Move the emergency call button to the top-right when there's no SIM.
Derek Sollenberger [Thu, 10 Dec 2009 15:02:04 +0000 (07:02 -0800)]
am
45ccb6a5: am
51ef573a: Switching from activity based full screen plugins to a view system overlay.
Merge commit '
45ccb6a55e0c3ec23a5bbf710d0d170bc39985ed'
* commit '
45ccb6a55e0c3ec23a5bbf710d0d170bc39985ed':
Switching from activity based full screen plugins to a view system overlay.
Trevor Johns [Thu, 10 Dec 2009 15:01:37 +0000 (07:01 -0800)]
am
15650af4: am
7e42e8f3: am
d59fb6e7: Updating list of standard Intents in android.content.Intent documentation.
Merge commit '
15650af4ab1df7fb84839162f9409d88cb4a3ccc'
* commit '
15650af4ab1df7fb84839162f9409d88cb4a3ccc':
Updating list of standard Intents in android.content.Intent
Wu-cheng Li [Thu, 10 Dec 2009 15:01:12 +0000 (07:01 -0800)]
am
90073aad: am
ebc77994: am
9c79938d: Document that some parameters will not be null and fix getSupportedPictureFormats.
Merge commit '
90073aadd5dfdbb0e7ca9b53ae086536f976793f'
* commit '
90073aadd5dfdbb0e7ca9b53ae086536f976793f':
Document that some parameters will not be null and fix getSupportedPictureFormats.
Dianne Hackborn [Thu, 10 Dec 2009 15:00:47 +0000 (07:00 -0800)]
am
aeabdf32: am
0766b2d0: Update service example code.
Merge commit '
aeabdf32a2a38c1627102b90628b7261447d3a5c'
* commit '
aeabdf32a2a38c1627102b90628b7261447d3a5c':
Update service example code.
Mike Lockwood [Thu, 10 Dec 2009 15:00:22 +0000 (07:00 -0800)]
am
20db8604: am
259e3384: am
7e90005f: Merge change I705b1d33 into eclair
Merge commit '
20db86042618e6ef422e28a9e328336b98d526b7'
* commit '
20db86042618e6ef422e28a9e328336b98d526b7':
GpsLocationProvider: Do not release wakelock until the GPS engine is fully off
Fred Quintana [Thu, 10 Dec 2009 14:59:55 +0000 (06:59 -0800)]
am
517ebaa6: am
18ff0e32: am
1067c3cb: Merge change Ia5ef9acd into eclair
Merge commit '
517ebaa69a9c4baed99bb5667b956dab129c96e7'
* commit '
517ebaa69a9c4baed99bb5667b956dab129c96e7':
remove an old STOPSHIP comment
Doug Kwan [Thu, 10 Dec 2009 00:32:04 +0000 (16:32 -0800)]
Add missing library in linker option. Currently the library is used by the
executable but not specified. It is included via dependency of another shared
object.
Android (Google) Code Review [Thu, 10 Dec 2009 00:07:57 +0000 (16:07 -0800)]
Merge change I5ddc721d
* changes:
Add misssing symbol type directives.
Amith Yamasani [Wed, 9 Dec 2009 23:53:02 +0000 (15:53 -0800)]
am
1ee7b645: Merge change I0743a389 into eclair-mr2
Merge commit '
1ee7b6453aaae47a6493a97790b9483aca1556c9' into eclair-mr2-plus-aosp
* commit '
1ee7b6453aaae47a6493a97790b9483aca1556c9':
Close popup when Keyboard gets a CANCEL motion event.
Christopher Tate [Wed, 9 Dec 2009 23:52:43 +0000 (15:52 -0800)]
am
a5ba0a78: am
767eb427: Merge change If990cab0 into eclair
Merge commit '
a5ba0a78811fcd5d3470bfa09df3e0106b77567e' into eclair-mr2-plus-aosp
* commit '
a5ba0a78811fcd5d3470bfa09df3e0106b77567e':
Make sure to acknowledge stale broadcasts
Joe Onorato [Wed, 9 Dec 2009 23:52:28 +0000 (15:52 -0800)]
am
b43b5def: am
0d8055e5: Paper over
2275704 by not having LotsOfApps installed on the monkeys builds.
Merge commit '
b43b5deff30d0ba77ea5b93d3e74507bfe2528be' into eclair-mr2-plus-aosp
* commit '
b43b5deff30d0ba77ea5b93d3e74507bfe2528be':
Paper over
2275704 by not having LotsOfApps installed on the monkeys builds.
Grace Kloba [Wed, 9 Dec 2009 23:51:58 +0000 (15:51 -0800)]
am
3f40bd48: Remove the code where we suspect webkit draw during drag. It was added for the better performance of panning while loading. But it does make sites using touch event look bad as we don\'t have the display tree until touch up.
Merge commit '
3f40bd48d278a40603f3f7d7b9d602ecbc09246d' into eclair-mr2-plus-aosp
* commit '
3f40bd48d278a40603f3f7d7b9d602ecbc09246d':
Remove the code where we suspect webkit draw during
Ken Shirriff [Wed, 9 Dec 2009 23:51:42 +0000 (15:51 -0800)]
am
a4d0a67e: Merge change Ifb0a0398 into eclair-mr2
Merge commit '
a4d0a67ed02c56dceaae01f328381b280d8fc1b7' into eclair-mr2-plus-aosp
* commit '
a4d0a67ed02c56dceaae01f328381b280d8fc1b7':
Fix build breakage. Rename NetStat to TrafficStats in preloaded-classes.
Kenny Root [Wed, 9 Dec 2009 23:51:21 +0000 (15:51 -0800)]
am
e6c0e993: Merge change I129483f8 into eclair-mr2
Merge commit '
e6c0e99334bc2f47e5d36db253ac8f166047c03b' into eclair-mr2-plus-aosp
* commit '
e6c0e99334bc2f47e5d36db253ac8f166047c03b':
Optional use of UTF-8 strings in resource bundles
Ken Shirriff [Wed, 9 Dec 2009 23:50:28 +0000 (15:50 -0800)]
am
1270e2e2: Merge change I96ddd6e2 into eclair-mr2
Merge commit '
1270e2e22b0b3f0705cee2b82788d8dc3fb03cdb' into eclair-mr2-plus-aosp
* commit '
1270e2e22b0b3f0705cee2b82788d8dc3fb03cdb':
Migration to TrafficStats.
Bjorn Bringert [Wed, 9 Dec 2009 23:50:05 +0000 (15:50 -0800)]
am
dcd8bad3: Merge change Ia28d9547 into eclair-mr2
Merge commit '
dcd8bad3aad8e4af6654ecd1776ebe5a18de94e3' into eclair-mr2-plus-aosp
* commit '
dcd8bad3aad8e4af6654ecd1776ebe5a18de94e3':
Expose SearchableInfo and getSearchablesInGlobalSearch()
Romain Guy [Wed, 9 Dec 2009 23:49:29 +0000 (15:49 -0800)]
am
06ffc12a: Merge change I237c1cee into eclair-mr2
Merge commit '
06ffc12a398bf16fb360d74b7511d946a73a741e' into eclair-mr2-plus-aosp
* commit '
06ffc12a398bf16fb360d74b7511d946a73a741e':
Improve exception message thrown when a View's state is of the wrong type.
Dianne Hackborn [Wed, 9 Dec 2009 23:49:02 +0000 (15:49 -0800)]
am
24eca800: Merge change I887f355f into eclair-mr2
Merge commit '
24eca800d4b34e7d13fbcbc1ab74c9d91ff6a4e1' into eclair-mr2-plus-aosp
* commit '
24eca800d4b34e7d13fbcbc1ab74c9d91ff6a4e1':
Propagate background scheduling class across processes.
Leon Scroggins [Wed, 9 Dec 2009 23:48:39 +0000 (15:48 -0800)]
am
6be3bf23: Some fixes for positioning the WebTextView.
Merge commit '
6be3bf2393030549306b438b9b17085035729135' into eclair-mr2-plus-aosp
* commit '
6be3bf2393030549306b438b9b17085035729135':
Some fixes for positioning the WebTextView.
Ken Shirriff [Wed, 9 Dec 2009 23:48:11 +0000 (15:48 -0800)]
am
f7d0b013: Add TrafficStats class to SDK.
Merge commit '
f7d0b01387c10f93bf17981d45087810c80f0902' into eclair-mr2-plus-aosp
* commit '
f7d0b01387c10f93bf17981d45087810c80f0902':
Add TrafficStats class to SDK.
Andreas Huber [Wed, 9 Dec 2009 23:47:35 +0000 (15:47 -0800)]
am
7c55c3f5: Make sure to use the hand-tweaked-assembly version of the relevant mp3 code if building for ARM.
Merge commit '
7c55c3f5f5997ca572d70ad513099a5af20a23c1' into eclair-mr2-plus-aosp
* commit '
7c55c3f5f5997ca572d70ad513099a5af20a23c1':
Make sure to use the hand-tweaked-assembly version of the relevant mp3 code if building for ARM.
Andreas Huber [Wed, 9 Dec 2009 23:46:43 +0000 (15:46 -0800)]
am
6d35d4c2: Merge change Ib16e5543 into eclair-mr2
Merge commit '
6d35d4c2cff4ad411fe7d6fde3fda0467d1016c5' into eclair-mr2-plus-aosp
* commit '
6d35d4c2cff4ad411fe7d6fde3fda0467d1016c5':
Fix the mp3 audio extractor that would occasionally return an invalid frame directly after a seek.
Andreas Huber [Wed, 9 Dec 2009 23:46:23 +0000 (15:46 -0800)]
am
3f5b2867: Merge change I8f658214 into eclair-mr2
Merge commit '
3f5b28679bb31b8ba8f75a2bf330ec0dc0ea14cc' into eclair-mr2-plus-aosp
* commit '
3f5b28679bb31b8ba8f75a2bf330ec0dc0ea14cc':
Minor tweaks to the mp3 and aac software decoders, propagate duration to output format.
Andreas Huber [Wed, 9 Dec 2009 23:46:03 +0000 (15:46 -0800)]
am
ee3a2443: Merge change Ic532c956 into eclair-mr2
Merge commit '
ee3a2443deb39ad9ce65293c045d34b9198cc57a' into eclair-mr2-plus-aosp
* commit '
ee3a2443deb39ad9ce65293c045d34b9198cc57a':
Note to self: Don't reverse the arguments to fseek(o)...
Daniel Sandler [Wed, 9 Dec 2009 23:45:26 +0000 (15:45 -0800)]
am
10c1dfad: Merge change Ifea65fb9 into eclair-mr2
Merge commit '
10c1dfad63ee7dace03b7914faf3c9891d096e25' into eclair-mr2-plus-aosp
* commit '
10c1dfad63ee7dace03b7914faf3c9891d096e25':
Move the emergency call button to the top-right when there's no SIM.
Derek Sollenberger [Wed, 9 Dec 2009 23:44:30 +0000 (15:44 -0800)]
am
51ef573a: Switching from activity based full screen plugins to a view system overlay.
Merge commit '
51ef573a8336c637ac508c49b84b512d8f11fa3a' into eclair-mr2-plus-aosp
* commit '
51ef573a8336c637ac508c49b84b512d8f11fa3a':
Switching from activity based full screen plugins to a view system overlay.
Trevor Johns [Wed, 9 Dec 2009 23:43:13 +0000 (15:43 -0800)]
am
7e42e8f3: am
d59fb6e7: Updating list of standard Intents in android.content.Intent documentation.
Merge commit '
7e42e8f33446107d6abcbb69f4624abf1bba5fad' into eclair-mr2-plus-aosp
* commit '
7e42e8f33446107d6abcbb69f4624abf1bba5fad':
Updating list of standard Intents in android.content.Intent
Wu-cheng Li [Wed, 9 Dec 2009 23:42:20 +0000 (15:42 -0800)]
am
ebc77994: am
9c79938d: Document that some parameters will not be null and fix getSupportedPictureFormats.
Merge commit '
ebc7799444ccd4d34863f1a07e885ca423a49c43' into eclair-mr2-plus-aosp
* commit '
ebc7799444ccd4d34863f1a07e885ca423a49c43':
Document that some parameters will not be null and fix getSupportedPictureFormats.
Dianne Hackborn [Wed, 9 Dec 2009 23:41:30 +0000 (15:41 -0800)]
am
0766b2d0: Update service example code.
Merge commit '
0766b2d0f398dcad10e332b695bbc0cbe5011882' into eclair-mr2-plus-aosp
* commit '
0766b2d0f398dcad10e332b695bbc0cbe5011882':
Update service example code.
Mike Lockwood [Wed, 9 Dec 2009 23:40:44 +0000 (15:40 -0800)]
am
259e3384: am
7e90005f: Merge change I705b1d33 into eclair
Merge commit '
259e3384face72ea8e30696d7bae492d37d44e8b' into eclair-mr2-plus-aosp
* commit '
259e3384face72ea8e30696d7bae492d37d44e8b':
GpsLocationProvider: Do not release wakelock until the GPS engine is fully off
Fred Quintana [Wed, 9 Dec 2009 23:40:06 +0000 (15:40 -0800)]
am
18ff0e32: am
1067c3cb: Merge change Ia5ef9acd into eclair
Merge commit '
18ff0e329b314e033e4bfb92b24ecab961f0eb99' into eclair-mr2-plus-aosp
* commit '
18ff0e329b314e033e4bfb92b24ecab961f0eb99':
remove an old STOPSHIP comment
Android (Google) Code Review [Wed, 9 Dec 2009 04:13:44 +0000 (20:13 -0800)]
Merge change Ibe6eac82
* changes:
Implement Matrix Palette extension.
Jaikumar Ganesh [Tue, 8 Dec 2009 22:50:43 +0000 (14:50 -0800)]
am
dbdabca7: am
b08170ad: am
ae88e2d1: Merge change I38227501 into eclair
Merge commit '
dbdabca716e0873a7c36d4f1ddd0fdb5ca412bc4'
* commit '
dbdabca716e0873a7c36d4f1ddd0fdb5ca412bc4':
Add API to get Active Sinks.
Robert Greenwalt [Tue, 8 Dec 2009 22:50:31 +0000 (14:50 -0800)]
am
dbf68aa3: (-s ours) am
54a4a66d: am
9ae9763b: (-s ours) Merge change Ib097fbbf into eclair
Merge commit '
dbf68aa372078f4f55a267e1eb182dd360384467'
* commit '
dbf68aa372078f4f55a267e1eb182dd360384467':
DO NOT MERGE Reverting change I53e91db7.
Jaikumar Ganesh [Tue, 8 Dec 2009 22:50:15 +0000 (14:50 -0800)]
am
1fbc280d: am
47cc8112: am
9d3cb9bf: Merge change I204e4787 into eclair
Merge commit '
1fbc280dac0ce5089ff1491612944344af8d72b4'
* commit '
1fbc280dac0ce5089ff1491612944344af8d72b4':
Fix updating Bluetooth icon on status bar and for Wifi.
Android (Google) Code Review [Tue, 8 Dec 2009 22:37:38 +0000 (14:37 -0800)]
Merge change I0743a389 into eclair-mr2
* changes:
Close popup when Keyboard gets a CANCEL motion event.
Amith Yamasani [Tue, 8 Dec 2009 22:18:19 +0000 (14:18 -0800)]
Close popup when Keyboard gets a CANCEL motion event.
Needed for Extension keyboard feature.
Christopher Tate [Tue, 8 Dec 2009 22:11:33 +0000 (14:11 -0800)]
am
767eb427: Merge change If990cab0 into eclair
Merge commit '
767eb427fa8eca6c842c629cd4bfbf3551692148' into eclair-mr2
* commit '
767eb427fa8eca6c842c629cd4bfbf3551692148':
Make sure to acknowledge stale broadcasts
Joe Onorato [Tue, 8 Dec 2009 22:08:51 +0000 (14:08 -0800)]
am
0d8055e5: Paper over
2275704 by not having LotsOfApps installed on the monkeys builds.
Merge commit '
0d8055e51ce2666875e14c53e14765f673172b1c' into eclair-mr2
* commit '
0d8055e51ce2666875e14c53e14765f673172b1c':
Paper over
2275704 by not having LotsOfApps installed on the monkeys builds.
Android (Google) Code Review [Tue, 8 Dec 2009 22:07:50 +0000 (14:07 -0800)]
Merge change If990cab0 into eclair
* changes:
Make sure to acknowledge stale broadcasts
Joe Onorato [Tue, 8 Dec 2009 22:02:09 +0000 (14:02 -0800)]
Paper over
2275704 by not having LotsOfApps installed on the monkeys builds.
Grace Kloba [Mon, 7 Dec 2009 22:47:28 +0000 (14:47 -0800)]
Remove the code where we suspect webkit draw during
drag. It was added for the better performance of panning
while loading. But it does make sites using touch event
look bad as we don't have the display tree until touch up.
Fix http://b/issue?id=
2310295
Christopher Tate [Tue, 8 Dec 2009 21:48:45 +0000 (13:48 -0800)]
Make sure to acknowledge stale broadcasts
If a broadcast arrives at a process but the receiver has been unregistered in
the interval between dispatch and its arrival on the receiving process's side,
we were simply dropping the broadcast entirely, leading to spurious ANRs and
potentially issues involving future broadcasts being timed out incorrectly. Fix
this by making sure to correctly 'finish' a broadcast even when the recipient
app no longer has any receiver that matches the broadcast's profile.
Change-Id: If990cab021a26668052cb536753f6c308d80a5b4
Android (Google) Code Review [Tue, 8 Dec 2009 21:46:49 +0000 (13:46 -0800)]
Merge change Ifb0a0398 into eclair-mr2
* changes:
Fix build breakage. Rename NetStat to TrafficStats in preloaded-classes.
Android (Google) Code Review [Tue, 8 Dec 2009 21:41:38 +0000 (13:41 -0800)]
Merge change I129483f8 into eclair-mr2
* changes:
Optional use of UTF-8 strings in resource bundles
Ken Shirriff [Tue, 8 Dec 2009 21:38:48 +0000 (13:38 -0800)]
Fix build breakage. Rename NetStat to TrafficStats in preloaded-classes.
Robert Greenwalt [Tue, 8 Dec 2009 21:30:56 +0000 (13:30 -0800)]
resolved conflicts for merge of
47a2573e to master
Android (Google) Code Review [Tue, 8 Dec 2009 20:41:51 +0000 (12:41 -0800)]
Merge change I96ddd6e2 into eclair-mr2
* changes:
Migration to TrafficStats.
Android (Google) Code Review [Tue, 8 Dec 2009 20:10:47 +0000 (12:10 -0800)]
Merge change Ia28d9547 into eclair-mr2
* changes:
Expose SearchableInfo and getSearchablesInGlobalSearch()
Android (Google) Code Review [Tue, 8 Dec 2009 19:32:50 +0000 (11:32 -0800)]
Merge change I237c1cee into eclair-mr2
* changes:
Improve exception message thrown when a View's state is of the wrong type.
Romain Guy [Tue, 8 Dec 2009 19:30:25 +0000 (11:30 -0800)]
Improve exception message thrown when a View's state is of the wrong type.
Android (Google) Code Review [Tue, 8 Dec 2009 19:25:48 +0000 (11:25 -0800)]
Merge change I887f355f into eclair-mr2
* changes:
Propagate background scheduling class across processes.
Doug Kwan [Mon, 7 Dec 2009 21:21:24 +0000 (13:21 -0800)]
Add misssing symbol type directives.
Bjorn Bringert [Mon, 7 Dec 2009 10:41:24 +0000 (10:41 +0000)]
Expose SearchableInfo and getSearchablesInGlobalSearch()
This is needed for search unbundling.
Fixes http://b/issue?id=
2270838
Change-Id: Ia28d954736c9afd68da22a38da966ed780d797c2
Leon Scroggins [Tue, 8 Dec 2009 18:43:47 +0000 (13:43 -0500)]
Some fixes for positioning the WebTextView.
Move the change in position/size before the call to bring into view,
so that the properly positioned field will be brought into view. It
is also now before we check to see if it is the same textfield, so
it happens in both cases.
Also remove some code which checks the selection and then sets it
unnecessarily. It was originally surrounding some code which called
setRect, which had a side-effect of changing the selection. That
code was removed (rendering the remaining code useless), and setRect
no longer has the side effect (the side effect was a result of calling
reqestFocus, which it no longer does - further, the change in selection from
requestFocus no longer affects the textfield's text).
Ken Shirriff [Mon, 7 Dec 2009 23:57:35 +0000 (15:57 -0800)]
Migration to TrafficStats.
TrafficStats is the SDK version of NetStat.
Ken Shirriff [Mon, 7 Dec 2009 23:56:05 +0000 (15:56 -0800)]
Add TrafficStats class to SDK.
This class (a rename of NetStat) provides network byte and packet statistics.
NetStat will be removed separately, to avoid breaking other packages when submitting.
Andreas Huber [Tue, 8 Dec 2009 18:07:22 +0000 (10:07 -0800)]
Make sure to use the hand-tweaked-assembly version of the relevant mp3 code if building for ARM.
Android (Google) Code Review [Tue, 8 Dec 2009 17:16:08 +0000 (09:16 -0800)]
Merge change Ib16e5543 into eclair-mr2
* changes:
Fix the mp3 audio extractor that would occasionally return an invalid frame directly after a seek.
Android (Google) Code Review [Tue, 8 Dec 2009 17:16:00 +0000 (09:16 -0800)]
Merge change I8f658214 into eclair-mr2
* changes:
Minor tweaks to the mp3 and aac software decoders, propagate duration to output format.
Android (Google) Code Review [Tue, 8 Dec 2009 17:15:46 +0000 (09:15 -0800)]
Merge change Ic532c956 into eclair-mr2
* changes:
Note to self: Don't reverse the arguments to fseek(o)...
Android (Google) Code Review [Tue, 8 Dec 2009 15:59:34 +0000 (07:59 -0800)]
Merge change Ifea65fb9 into eclair-mr2
* changes:
Move the emergency call button to the top-right when there's no SIM.
Derek Sollenberger [Mon, 7 Dec 2009 21:15:13 +0000 (16:15 -0500)]
Switching from activity based full screen plugins to a view system overlay.
Jack Palevich [Tue, 8 Dec 2009 07:43:51 +0000 (15:43 +0800)]
Implement Matrix Palette extension.
Adds support for formerly-unimplemented methods:
glCurrentPaletteMatrixOES
glLoadPaletteFromModelViewMatrixOES
glMatrixIndexPointerOES
glWeightPointerOES
The bulk of the changes are related to implementing the two PointerOES
methods, which are implemented pretty much the same way as the existing
Pointer methods were implemented.
This change also changes the way glPointSizePointerOES is implemented,
making it act like all the other Pointer methods. (Previously it was
not handling non-direct-buffer arguments correctly.)
Fixes bug
2308625 "Support matrix palette skinning
in JSR239 and related APIs"
Also updated GLLogWraper to fix two bugs in GLLogWrapper that were
discovered while testing matrix palette skinning support:
a) Handle trying to print the contents of null-but-enabled buffers.
(It's not legal to draw with null-but-enabled buffers, and
in fact some OpenGL drivers will crash if you try to render in this
state, but there's no reason the GLLogWrapper should crash while trying
to debug this situation.
b) Don't read off the end of a vertex buffer with non-zero position when
printing the entire contents of the vertex buffer. Now we only print from
the current position to the end of the buffer.
Trevor Johns [Tue, 8 Dec 2009 06:42:46 +0000 (22:42 -0800)]
am
d59fb6e7: Updating list of standard Intents in android.content.Intent documentation.
Merge commit '
d59fb6e7435b57d83662b196f5430e6f2bc5427b' into eclair-mr2
* commit '
d59fb6e7435b57d83662b196f5430e6f2bc5427b':
Updating list of standard Intents in android.content.Intent
Trevor Johns [Fri, 20 Nov 2009 20:54:57 +0000 (12:54 -0800)]
Updating list of standard Intents in android.content.Intent
documentation.
Wu-cheng Li [Tue, 8 Dec 2009 03:38:01 +0000 (19:38 -0800)]
am
9c79938d: Document that some parameters will not be null and fix getSupportedPictureFormats.
Merge commit '
9c79938d47a3caa06e5fb956955374f30c55992b' into eclair-mr2
* commit '
9c79938d47a3caa06e5fb956955374f30c55992b':
Document that some parameters will not be null and fix getSupportedPictureFormats.
Dianne Hackborn [Tue, 8 Dec 2009 01:59:37 +0000 (17:59 -0800)]
Propagate background scheduling class across processes.
This is a very simply implementation: upon receiving an IPC, if the handling
thread is at a background priority (the driver will have taken care of
propagating this from the calling thread), then stick it in to the background
scheduling group. Plus an API to turn this off for the process, which is
used by the system process.
This also pulls some of the code for managing scheduling classes out of
the Process JNI wrappers and in to some convenience methods in thread.h.
Vasu Nori [Tue, 8 Dec 2009 02:38:11 +0000 (18:38 -0800)]
am
976ed437: am
6be01bf2: Merge change Ifa1fae13 into eclair-mr2
Merge commit '
976ed43786dcf078a0f802716d49644691656a24'
* commit '
976ed43786dcf078a0f802716d49644691656a24':
Revert "dealloc compiled-sql statements before deref'ing them from SQLiteDatabase obj."
Evan Millar [Tue, 8 Dec 2009 02:37:57 +0000 (18:37 -0800)]
am
4adf8017: am
b5eb3902: Merge change Ie70845ca into eclair-mr2
Merge commit '
4adf8017374c20f725400233fc7b039613c78caf'
* commit '
4adf8017374c20f725400233fc7b039613c78caf':
Add Sets#newSortedSet()
Andreas Huber [Tue, 8 Dec 2009 02:37:46 +0000 (18:37 -0800)]
am
9659126d: am
247003be: Merge change I250f2433 into eclair-mr2
Merge commit '
9659126db10f65b6e502b2175d34c75b301fb7e9'
* commit '
9659126db10f65b6e502b2175d34c75b301fb7e9':
Initial checkin of stagefright MP3 audio decoder based on PV source code.
Leon Scroggins [Tue, 8 Dec 2009 02:37:16 +0000 (18:37 -0800)]
am
0092ee13: am
6761e85d: Merge change Idff5eb2a into eclair-mr2
Merge commit '
0092ee13e4490bbd8de522d256fb4d7dab81be60'
* commit '
0092ee13e4490bbd8de522d256fb4d7dab81be60':
Set InputType of WebTextView according to <input> field's type.
Grace Kloba [Tue, 8 Dec 2009 02:37:00 +0000 (18:37 -0800)]
am
8657978a: am
ddcea3d2: Expose onReceivedSslError() so that the WebView client can accept the error and continue.
Merge commit '
8657978aabc7141869926a98a0da257255678dd4'
* commit '
8657978aabc7141869926a98a0da257255678dd4':
Expose onReceivedSslError() so that the WebView client
Grace Kloba [Tue, 8 Dec 2009 02:36:32 +0000 (18:36 -0800)]
am
a49f91a2: am
14467eb2: Merge change I234162b0 into eclair-mr2
Merge commit '
a49f91a2cb0cf39fa07d25ba896f5bf115b768e7'
* commit '
a49f91a2cb0cf39fa07d25ba896f5bf115b768e7':
Add "res" support for WebView.
Dave Sparks [Tue, 8 Dec 2009 02:36:00 +0000 (18:36 -0800)]
am
610e50cc: am
62679112: Merge change I3c256cf3 into eclair-mr2
Merge commit '
610e50ccd2a342fbc75e3b30a2057dbca8fb92fd'
* commit '
610e50ccd2a342fbc75e3b30a2057dbca8fb92fd':
More SoundPool cleanup. Remove mSoundPoolRef and unused notify callback.
Jason Sams [Tue, 8 Dec 2009 02:35:48 +0000 (18:35 -0800)]
am
54f5ca41: am
ffacbc34: am
fd2f6358: Merge change I771bebb9 into eclair
Merge commit '
54f5ca4115b776eb5a1e04a4c014acccb916ef9c'
* commit '
54f5ca4115b776eb5a1e04a4c014acccb916ef9c':
Add Java exceptions to catch RS calls with no context or no surface.
Daniel Sandler [Tue, 8 Dec 2009 02:35:36 +0000 (18:35 -0800)]
am
0128c250: am
1b15acf7: Merge change I21eb4b87 into eclair-mr2
Merge commit '
0128c250e3a81e5d3793126ad82b2ce3c387a4ef'
* commit '
0128c250e3a81e5d3793126ad82b2ce3c387a4ef':
Allow room for descenders in am/pm text.
Dave Sparks [Tue, 8 Dec 2009 02:35:23 +0000 (18:35 -0800)]
am
5ac5cd73: am
9d5b7aca: Merge change Ic0e3ddf8 into eclair-mr2
Merge commit '
5ac5cd7300fda7cb80ae0fb3d66594abd4f91939'
* commit '
5ac5cd7300fda7cb80ae0fb3d66594abd4f91939':
Remove unused Java object reference in native SoundPool code.
Eric Laurent [Tue, 8 Dec 2009 02:35:06 +0000 (18:35 -0800)]
am
bf831e0d: am
38f6bdc4: am
0a08029f: Fix issue
2306779: Runtime restart - Init failed at android.media.ToneGenerator.
Merge commit '
bf831e0de0fd1636a7ee2670faed208f96f23f65'
* commit '
bf831e0de0fd1636a7ee2670faed208f96f23f65':
Fix issue
2306779: Runtime restart - Init failed at android.media.ToneGenerator.
Andreas Huber [Tue, 8 Dec 2009 02:34:41 +0000 (18:34 -0800)]
am
2109e680: am
8c7ab034: Fixing the build, only instantiate the software aac decoder in full stagefright builds.
Merge commit '
2109e6801199b10460330027f3537d406b6a0149'
* commit '
2109e6801199b10460330027f3537d406b6a0149':
Fixing the build, only instantiate the software aac decoder in full stagefright builds.
Andreas Huber [Tue, 8 Dec 2009 02:34:13 +0000 (18:34 -0800)]
am
81a005d0: am
73abc2ea: Merge change I9c6e1f90 into eclair-mr2
Merge commit '
81a005d070bec3a756f5caa48cdda25bcc732ce9'
* commit '
81a005d070bec3a756f5caa48cdda25bcc732ce9':
Initial check in of stagefright software AAC decoder based on PV source code.
Eric Laurent [Tue, 8 Dec 2009 02:33:53 +0000 (18:33 -0800)]
am
e30bae7f: am
b8341cf7: am
6d42d806: Merge change I9cc489a2 into eclair
Merge commit '
e30bae7f8ef0489788c155ae44d9a57beca1acf5'
* commit '
e30bae7f8ef0489788c155ae44d9a57beca1acf5':
Fix issue
2304669: VoiceIME: starting and canceling voice IME yields persistent "error 8" state on future attempts and breaks voice search.
Yu Shan Emily Lau [Tue, 8 Dec 2009 02:33:38 +0000 (18:33 -0800)]
am
a3d15d3b: am
8e6d79e2: am
8445f367: Merge change Ibb9b1de1 into eclair
Merge commit '
a3d15d3b01146df40e72d67b79dd1f9368398f23'
* commit '
a3d15d3b01146df40e72d67b79dd1f9368398f23':
1) Capture the start memory before the test started