Commit Graph

13501 Commits

Author SHA1 Message Date
Paul Westbrook
1cf55c566c am b882b361: Merge change Iee7f2457 into eclair-mr2
Merge commit 'b882b361f123e4ef7870c99e8a9fd9e1be48e396' into eclair-mr2-plus-aosp

* commit 'b882b361f123e4ef7870c99e8a9fd9e1be48e396':
  Deleted Gmail.java from frameworks.  Previously it had been moved to vendor/google/.../Gmail/...
2009-12-09 15:55:42 -08:00
Dianne Hackborn
eb68a22656 am af9788a9: Merge change Ia53c6725 into eclair-mr2
Merge commit 'af9788a9d6c238dd97f40dc020e036739daf0811' into eclair-mr2-plus-aosp

* commit 'af9788a9d6c238dd97f40dc020e036739daf0811':
  Add bindService API to not bring ot foreground.
2009-12-09 15:55:28 -08:00
Robert Greenwalt
5ee73c716b am 7614d3d8: am 68b15b68: Porting change I064698b3 from mr2 to eclair.
Merge commit '7614d3d819315b1ca15088e617f12d0f0ea41b06' into eclair-mr2-plus-aosp

* commit '7614d3d819315b1ca15088e617f12d0f0ea41b06':
  Porting change I064698b3 from mr2 to eclair.
2009-12-09 15:55:15 -08:00
Romain Guy
e0b52cad92 am ea4823c1: Improve javadoc in View.
Merge commit 'ea4823c1c7fdee093789850d0f76a3df22ca58d2' into eclair-mr2-plus-aosp

* commit 'ea4823c1c7fdee093789850d0f76a3df22ca58d2':
  Improve javadoc in View.
2009-12-09 15:53:26 -08:00
Amith Yamasani
774568f739 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.
2009-12-09 15:53:02 -08:00
Christopher Tate
3a0a9e25a8 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
2009-12-09 15:52:43 -08:00
Joe Onorato
c97c5c0b9b 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.
2009-12-09 15:52:28 -08:00
Grace Kloba
506afbd600 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
2009-12-09 15:51:58 -08:00
Ken Shirriff
cd6e3484c5 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.
2009-12-09 15:51:42 -08:00
Kenny Root
5cd6fcd518 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
2009-12-09 15:51:21 -08:00
Ken Shirriff
d44c2f2c85 am 1270e2e2: Merge change I96ddd6e2 into eclair-mr2
Merge commit '1270e2e22b0b3f0705cee2b82788d8dc3fb03cdb' into eclair-mr2-plus-aosp

* commit '1270e2e22b0b3f0705cee2b82788d8dc3fb03cdb':
  Migration to TrafficStats.
2009-12-09 15:50:28 -08:00
Bjorn Bringert
c99f154b54 am dcd8bad3: Merge change Ia28d9547 into eclair-mr2
Merge commit 'dcd8bad3aad8e4af6654ecd1776ebe5a18de94e3' into eclair-mr2-plus-aosp

* commit 'dcd8bad3aad8e4af6654ecd1776ebe5a18de94e3':
  Expose SearchableInfo and getSearchablesInGlobalSearch()
2009-12-09 15:50:05 -08:00
Romain Guy
8f4bca2aca 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.
2009-12-09 15:49:29 -08:00
Dianne Hackborn
68a3b8b660 am 24eca800: Merge change I887f355f into eclair-mr2
Merge commit '24eca800d4b34e7d13fbcbc1ab74c9d91ff6a4e1' into eclair-mr2-plus-aosp

* commit '24eca800d4b34e7d13fbcbc1ab74c9d91ff6a4e1':
  Propagate background scheduling class across processes.
2009-12-09 15:49:02 -08:00
Leon Scroggins
9f1ea0d47f am 6be3bf23: Some fixes for positioning the WebTextView.
Merge commit '6be3bf2393030549306b438b9b17085035729135' into eclair-mr2-plus-aosp

* commit '6be3bf2393030549306b438b9b17085035729135':
  Some fixes for positioning the WebTextView.
2009-12-09 15:48:39 -08:00
Ken Shirriff
0e933c853a am f7d0b013: Add TrafficStats class to SDK.
Merge commit 'f7d0b01387c10f93bf17981d45087810c80f0902' into eclair-mr2-plus-aosp

* commit 'f7d0b01387c10f93bf17981d45087810c80f0902':
  Add TrafficStats class to SDK.
2009-12-09 15:48:11 -08:00
Andreas Huber
30807a4500 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.
2009-12-09 15:47:35 -08:00
Andreas Huber
b16cf676bd 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.
2009-12-09 15:46:43 -08:00
Andreas Huber
a42b8f160f 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.
2009-12-09 15:46:23 -08:00
Andreas Huber
42be7440ee 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)...
2009-12-09 15:46:03 -08:00
Daniel Sandler
f43eeef301 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.
2009-12-09 15:45:26 -08:00
Derek Sollenberger
45ccb6a55e 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.
2009-12-09 15:44:30 -08:00
Trevor Johns
15650af4ab 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
2009-12-09 15:43:13 -08:00
Wu-cheng Li
90073aadd5 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.
2009-12-09 15:42:20 -08:00
Dianne Hackborn
aeabdf32a2 am 0766b2d0: Update service example code.
Merge commit '0766b2d0f398dcad10e332b695bbc0cbe5011882' into eclair-mr2-plus-aosp

* commit '0766b2d0f398dcad10e332b695bbc0cbe5011882':
  Update service example code.
2009-12-09 15:41:30 -08:00
Mike Lockwood
20db860426 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
2009-12-09 15:40:44 -08:00
Fred Quintana
517ebaa69a am 18ff0e32: am 1067c3cb: Merge change Ia5ef9acd into eclair
Merge commit '18ff0e329b314e033e4bfb92b24ecab961f0eb99' into eclair-mr2-plus-aosp

* commit '18ff0e329b314e033e4bfb92b24ecab961f0eb99':
  remove an old STOPSHIP comment
2009-12-09 15:40:06 -08:00
Android (Google) Code Review
b882b361f1 Merge change Iee7f2457 into eclair-mr2
* changes:
  Deleted Gmail.java from frameworks.  Previously it had been moved to vendor/google/.../Gmail/...
2009-12-08 16:35:05 -08:00
Android (Google) Code Review
af9788a9d6 Merge change Ia53c6725 into eclair-mr2
* changes:
  Add bindService API to not bring ot foreground.
2009-12-08 16:34:48 -08:00
Robert Greenwalt
7614d3d819 am 68b15b68: Porting change I064698b3 from mr2 to eclair.
Merge commit '68b15b68497e373fe63a13f11e18349a738a7989' into eclair-mr2

* commit '68b15b68497e373fe63a13f11e18349a738a7989':
  Porting change I064698b3 from mr2 to eclair.
2009-12-08 16:33:59 -08:00
Dianne Hackborn
09c916bccb Add bindService API to not bring ot foreground.
Add a new flag for bindService that tells the system to not bring the
target service's process in to the foreground scheduling class.  This is
used by the sync system to not cause the current sync adapter to come to
the foreground as it is running.

Also some small improvements to the debug output of the process list
of oom adj and scheduling info.
2009-12-08 16:33:59 -08:00
Paul Westbrook
286b191d30 Deleted Gmail.java from frameworks. Previously it had been moved to vendor/google/.../Gmail/... 2009-12-08 15:43:56 -08:00
Robert Greenwalt
68b15b6849 Porting change I064698b3 from mr2 to eclair.
Add support for "HANGED" driver state - we'll reboot the driver when requested (by the driver).

bug: 2310372
2009-12-08 15:37:47 -08:00
Romain Guy
ea4823c1c7 Improve javadoc in View. 2009-12-08 15:15:46 -08:00
Android (Google) Code Review
1ee7b6453a Merge change I0743a389 into eclair-mr2
* changes:
  Close popup when Keyboard gets a CANCEL motion event.
2009-12-08 14:37:38 -08:00
Amith Yamasani
0743a389e8 Close popup when Keyboard gets a CANCEL motion event.
Needed for Extension keyboard feature.
2009-12-08 14:18:19 -08:00
Christopher Tate
a5ba0a7881 am 767eb427: Merge change If990cab0 into eclair
Merge commit '767eb427fa8eca6c842c629cd4bfbf3551692148' into eclair-mr2

* commit '767eb427fa8eca6c842c629cd4bfbf3551692148':
  Make sure to acknowledge stale broadcasts
2009-12-08 14:11:33 -08:00
Joe Onorato
b43b5deff3 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.
2009-12-08 14:08:51 -08:00
Android (Google) Code Review
767eb427fa Merge change If990cab0 into eclair
* changes:
  Make sure to acknowledge stale broadcasts
2009-12-08 14:07:50 -08:00
Joe Onorato
0d8055e51c Paper over 2275704 by not having LotsOfApps installed on the monkeys builds. 2009-12-08 14:02:09 -08:00
Grace Kloba
3f40bd48d2 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
2009-12-08 13:49:50 -08:00
Christopher Tate
08a462524a 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
2009-12-08 13:48:45 -08:00
Android (Google) Code Review
a4d0a67ed0 Merge change Ifb0a0398 into eclair-mr2
* changes:
  Fix build breakage.  Rename NetStat to TrafficStats in preloaded-classes.
2009-12-08 13:46:49 -08:00
Android (Google) Code Review
e6c0e99334 Merge change I129483f8 into eclair-mr2
* changes:
  Optional use of UTF-8 strings in resource bundles
2009-12-08 13:41:38 -08:00
Ken Shirriff
1ec8146ec4 Fix build breakage. Rename NetStat to TrafficStats in preloaded-classes. 2009-12-08 13:39:43 -08:00
Android (Google) Code Review
1270e2e22b Merge change I96ddd6e2 into eclair-mr2
* changes:
  Migration to TrafficStats.
2009-12-08 12:41:51 -08:00
Android (Google) Code Review
dcd8bad3aa Merge change Ia28d9547 into eclair-mr2
* changes:
  Expose SearchableInfo and getSearchablesInGlobalSearch()
2009-12-08 12:10:47 -08:00
Android (Google) Code Review
06ffc12a39 Merge change I237c1cee into eclair-mr2
* changes:
  Improve exception message thrown when a View's state is of the wrong type.
2009-12-08 11:32:50 -08:00
Romain Guy
237c1ceea3 Improve exception message thrown when a View's state is of the wrong type. 2009-12-08 11:30:25 -08:00
Android (Google) Code Review
24eca800d4 Merge change I887f355f into eclair-mr2
* changes:
  Propagate background scheduling class across processes.
2009-12-08 11:25:48 -08:00