Commit Graph

8733 Commits

Author SHA1 Message Date
Kenny Root
9cc6ab8f1d 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
24ba389b91 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
7a80b18a6d 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
3844cb18e0 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
bd9c7ac028 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
99050c0ed4 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
ca494091e6 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
976b040498 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
86206521ad 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
71926c67f2 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
074a909888 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
8ae3d3f912 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
0632e47c18 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
4ddc7fa4f7 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
64a44325ae 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
a58fb2aedc 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
f32ddc84ec 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
ce56c32969 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
eb318fd88d Merge change I129483f8 into eclair-mr2
* changes:
  Optional use of UTF-8 strings in resource bundles
2009-12-08 13:41:38 -08:00
Android (Google) Code Review
ea3ec40a5d Merge change I96ddd6e2 into eclair-mr2
* changes:
  Migration to TrafficStats.
2009-12-08 12:41:51 -08:00
Android (Google) Code Review
ccc23cfef7 Merge change Ia28d9547 into eclair-mr2
* changes:
  Expose SearchableInfo and getSearchablesInGlobalSearch()
2009-12-08 12:10:47 -08:00
Android (Google) Code Review
fc2b870ecf 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
Android (Google) Code Review
4a5ba7dd4b Merge change I887f355f into eclair-mr2
* changes:
  Propagate background scheduling class across processes.
2009-12-08 11:25:48 -08:00
Android (Google) Code Review
b098b6dfef Merge change Ib16e5543 into eclair-mr2
* changes:
  Fix the mp3 audio extractor that would occasionally return an invalid frame directly after a seek.
2009-12-08 09:16:08 -08:00
Android (Google) Code Review
8888279fe8 Merge change I8f658214 into eclair-mr2
* changes:
  Minor tweaks to the mp3 and aac software decoders, propagate duration to output format.
2009-12-08 09:16:00 -08:00
Android (Google) Code Review
8115899cfb Merge change Ic532c956 into eclair-mr2
* changes:
  Note to self: Don't reverse the arguments to fseek(o)...
2009-12-08 09:15:46 -08:00
Android (Google) Code Review
ad1fa03e70 Merge change Ifea65fb9 into eclair-mr2
* changes:
  Move the emergency call button to the top-right when there's no SIM.
2009-12-08 07:59:34 -08:00
Trevor Johns
fee7c08d9f 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
2009-12-07 22:42:46 -08:00
Wu-cheng Li
6545804c4b 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.
2009-12-07 19:38:01 -08:00
Dianne Hackborn
8c6cedc9bc 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.
2009-12-07 19:11:14 -08:00
Mike Lockwood
d56352bddd am 7e90005f: Merge change I705b1d33 into eclair
Merge commit '7e90005fcb95d4c20c92e915f4418b94341dda36' into eclair-mr2

* commit '7e90005fcb95d4c20c92e915f4418b94341dda36':
  GpsLocationProvider: Do not release wakelock until the GPS engine is fully off
2009-12-07 17:22:54 -08:00
Android (Google) Code Review
fe07788498 Merge change I705b1d33 into eclair
* changes:
  GpsLocationProvider: Do not release wakelock until the GPS engine is fully off
2009-12-07 17:17:47 -08:00
Fred Quintana
eb23b2c678 am 1067c3cb: Merge change Ia5ef9acd into eclair
Merge commit '1067c3cbab73a4bc75a2ebd2e3c51077db96fa24' into eclair-mr2

* commit '1067c3cbab73a4bc75a2ebd2e3c51077db96fa24':
  remove an old STOPSHIP comment
2009-12-07 17:04:40 -08:00
Android (Google) Code Review
b7e2059005 Merge change Ia5ef9acd into eclair
* changes:
  remove an old STOPSHIP comment
2009-12-07 16:59:46 -08:00
Jaikumar Ganesh
88a86e8ae1 am b08170ad: am ae88e2d1: Merge change I38227501 into eclair
Merge commit 'b08170ad7e4ca4908852b0e20759ea740b338a03' into eclair-mr2-plus-aosp

* commit 'b08170ad7e4ca4908852b0e20759ea740b338a03':
  Add API to get Active Sinks.
2009-12-07 15:57:28 -08:00
Jaikumar Ganesh
59746fefec am ae88e2d1: Merge change I38227501 into eclair
Merge commit 'ae88e2d130a4d69bdf7ddc58f6ae512ea63087ff' into eclair-mr2

* commit 'ae88e2d130a4d69bdf7ddc58f6ae512ea63087ff':
  Add API to get Active Sinks.
2009-12-07 15:53:02 -08:00
Android (Google) Code Review
d958f3c7bb Merge change I38227501 into eclair
* changes:
  Add API to get Active Sinks.
2009-12-07 15:49:50 -08:00
Robert Greenwalt
647b382a88 am 54a4a66d: am 9ae9763b: (-s ours) Merge change Ib097fbbf into eclair
Merge commit '54a4a66d38eff838d6d1fb3d0ede203aceb750c3' into eclair-mr2-plus-aosp

* commit '54a4a66d38eff838d6d1fb3d0ede203aceb750c3':
  DO NOT MERGE  Reverting change I53e91db7.
2009-12-07 15:36:25 -08:00
Jaikumar Ganesh
32cf6dc48e am 47cc8112: am 9d3cb9bf: Merge change I204e4787 into eclair
Merge commit '47cc8112c3f77637ef408ef18e48d146e8250a27' into eclair-mr2-plus-aosp

* commit '47cc8112c3f77637ef408ef18e48d146e8250a27':
  Fix updating Bluetooth icon on status bar and for Wifi.
2009-12-07 15:36:19 -08:00
Robert Greenwalt
dd77d38bf2 am 9ae9763b: (-s ours) Merge change Ib097fbbf into eclair
Merge commit '9ae9763b7e5dd872619b13c889b72b0df176f956' into eclair-mr2

* commit '9ae9763b7e5dd872619b13c889b72b0df176f956':
  DO NOT MERGE  Reverting change I53e91db7.
2009-12-07 15:31:50 -08:00
Jaikumar Ganesh
297951f5ab am 9d3cb9bf: Merge change I204e4787 into eclair
Merge commit '9d3cb9bfc6d7a5f340d2dd8132b201b933687564' into eclair-mr2

* commit '9d3cb9bfc6d7a5f340d2dd8132b201b933687564':
  Fix updating Bluetooth icon on status bar and for Wifi.
2009-12-07 15:31:43 -08:00
Android (Google) Code Review
6c0dae34e2 Merge change Ib097fbbf into eclair
* changes:
  DO NOT MERGE  Reverting change I53e91db7.
2009-12-07 15:27:19 -08:00
Android (Google) Code Review
ec68a21530 Merge change I204e4787 into eclair
* changes:
  Fix updating Bluetooth icon on status bar and for Wifi.
2009-12-07 15:27:02 -08:00
Kenny Root
92f5984d2c Optional use of UTF-8 strings in resource bundles
Allows the use of UTF-8 for packing resources instead of the
default of UTF-16 for Java. When strings are extracted from the
ResStringPool, they are converted to UTF-16 and the result is
cached for subsequent calls.

When using aapt to package, add in the "-8" switch to pack the
resources using UTF-8. This will result in the value, key, and
type strings as well as the compiled XML string values taking
significantly less space in the final application package in
most scenarios.

Change-Id: I129483f8b3d3b1c5869dced05cb525e494a6c83a
2009-12-07 15:14:15 -08:00
Robert Greenwalt
1cde0c8403 am 096871e7: am 90d1b745: Merge change I53e91db7 into eclair
Merge commit '096871e7e1a1f8cdfbaa1acc4bc485b69ddf22a4' into eclair-mr2-plus-aosp

* commit '096871e7e1a1f8cdfbaa1acc4bc485b69ddf22a4':
  Filter out minor Connectivity Notifications.
2009-12-07 15:13:51 -08:00
Robert Greenwalt
451a101c7c am 90d1b745: Merge change I53e91db7 into eclair
Merge commit '90d1b745ec4a7ccd15cdcc185420bf2000b4f7a3' into eclair-mr2

* commit '90d1b745ec4a7ccd15cdcc185420bf2000b4f7a3':
  Filter out minor Connectivity Notifications.
2009-12-07 15:09:46 -08:00
Android (Google) Code Review
ac16968db1 Merge change I53e91db7 into eclair
* changes:
  Filter out minor Connectivity Notifications.
2009-12-07 15:04:52 -08:00
Vasu Nori
d8f7aaf35c am 6be01bf2: Merge change Ifa1fae13 into eclair-mr2
Merge commit '6be01bf207077ffbdcd3879250171a26ec805835' into eclair-mr2-plus-aosp

* commit '6be01bf207077ffbdcd3879250171a26ec805835':
  Revert "dealloc compiled-sql statements before deref'ing them from SQLiteDatabase obj."
2009-12-07 14:58:04 -08:00
Android (Google) Code Review
bd3b011489 Merge change Ifa1fae13 into eclair-mr2
* changes:
  Revert "dealloc compiled-sql statements before deref'ing them from SQLiteDatabase obj."
2009-12-07 14:54:36 -08:00
Evan Millar
f6b6e9ed95 am b5eb3902: Merge change Ie70845ca into eclair-mr2
Merge commit 'b5eb3902ff92f895328928c6a8e05c90104e0c13' into eclair-mr2-plus-aosp

* commit 'b5eb3902ff92f895328928c6a8e05c90104e0c13':
  Add Sets#newSortedSet()
2009-12-07 14:45:43 -08:00