Commit Graph

6319 Commits

Author SHA1 Message Date
Jason Sams
8ba2d9b42a am fe7c2a50: Merge change I996db8da into eclair
Merge commit 'fe7c2a50148ac9f0d6fbe0030fc53f457c10870a' into eclair-plus-aosp

* commit 'fe7c2a50148ac9f0d6fbe0030fc53f457c10870a':
  Fix tls crash on startup if more than one RS contexts are created in one process.
2009-10-07 11:59:20 -07:00
gwang@google.com
ed30048288 am 521f4f3a: Merge change I3d6cf8aa into eclair
Merge commit '521f4f3af94e3a093a37af887d3e317a526b61a1' into eclair-plus-aosp

* commit '521f4f3af94e3a093a37af887d3e317a526b61a1':
  Fix for bug 2158794. Hide MediaPlayer.invoke() and MediaPlayer.newRequest(), and Fix bad links in ToneGenerator documentation.
2009-10-07 11:57:45 -07:00
Xavier Ducrohet
afdaafc286 am 5f9d4bae: layout lib tests cleanup
Merge commit '5f9d4bae03b2dfa9c1e43a6e01cacaa5a5326690' into eclair-plus-aosp

* commit '5f9d4bae03b2dfa9c1e43a6e01cacaa5a5326690':
  layout lib tests cleanup
2009-10-07 11:57:39 -07:00
Xavier Ducrohet
331a70cb20 am 0a9d46b7: Add a test to make sure the replaced classes in layoutlib are correct.
Merge commit '0a9d46b7e741ccf7272bb69a4eef3c1f2adc91b7' into eclair-plus-aosp

* commit '0a9d46b7e741ccf7272bb69a4eef3c1f2adc91b7':
  Add a test to make sure the replaced classes in layoutlib are correct.
2009-10-07 11:57:32 -07:00
Robert Greenwalt
6930ef9641 am 92b5caa4: Merge change Id8df149c into eclair
Merge commit '92b5caa4e21d48db6efeddba532d1546c6e686b1' into eclair-plus-aosp

* commit '92b5caa4e21d48db6efeddba532d1546c6e686b1':
  Turn some logging back on in ConnectionManager
2009-10-07 11:57:26 -07:00
Jim Miller
f0324f42d6 am f65161f1: Merge change If933b13d into eclair
Merge commit 'f65161f159db3d140c62f56d43e732c332af7773' into eclair-plus-aosp

* commit 'f65161f159db3d140c62f56d43e732c332af7773':
  Fix for 2161835: Tweaks to rotary lock screen:
2009-10-07 11:56:52 -07:00
Jason Sams
07e52b3269 am 968a9571: Merge change I516c3191 into eclair
Merge commit '968a9571a391a2dbb0512c4fb99d04ab50861753' into eclair-plus-aosp

* commit '968a9571a391a2dbb0512c4fb99d04ab50861753':
  Implement data push from scripts.  Fixes the problem where apps would have to poll to monitor a scripts state.
2009-10-07 11:56:45 -07:00
Wu-cheng Li
ffa4aa01f5 am 962f2536: Merge change I547cff66 into eclair
Merge commit '962f253665e0c5cc8a29de9e59ce3992dad02440' into eclair-plus-aosp

* commit '962f253665e0c5cc8a29de9e59ce3992dad02440':
  Add zoom functions and sendCommand.
2009-10-07 11:56:00 -07:00
Fred Quintana
ecfe3ef81b am f83d9b3f: fix build breakage
Merge commit 'f83d9b3fcd74f2528b0acc74185d2d7bdd716942' into eclair-plus-aosp

* commit 'f83d9b3fcd74f2528b0acc74185d2d7bdd716942':
  fix build breakage
2009-10-07 11:55:53 -07:00
Fred Quintana
05c0bb9de3 am 5bba632d: - hide Entity and all its references - remove updateEntity and insertEntity, since they are not used - add the RawContacts.Entity class, which is used in lieu of the android.content.Entity
Merge commit '5bba632d877c2878384ff21566c8eb6a1a22f37b' into eclair-plus-aosp

* commit '5bba632d877c2878384ff21566c8eb6a1a22f37b':
  - hide Entity and all its references
2009-10-07 11:55:10 -07:00
Suchi Amalapurapu
676933b954 am 5163cd6d: Merge change I5be3d603 into eclair
Merge commit '5163cd6d1cb664977eb4473b98657c7e92ae430e' into eclair-plus-aosp

* commit '5163cd6d1cb664977eb4473b98657c7e92ae430e':
  Make sdk version and code names static finals in PackageParser.
2009-10-07 11:54:44 -07:00
Daisuke Miyakawa
d0809c11ca am ccc214b2: Merge change I6a0b14bd into eclair
Merge commit 'ccc214b21edaaddf46960388ec4d3e3ca89a01ae' into eclair-plus-aosp

* commit 'ccc214b21edaaddf46960388ec4d3e3ca89a01ae':
  Make VCardComposer create the instance for mHandlerList.
2009-10-07 11:53:53 -07:00
Evan Millar
cca12f8483 am 9c3c276a: Merge change I8333dcc4 into eclair
Merge commit '9c3c276afa7e2485e1a9f47e29ada8cb61b7b07c' into eclair-plus-aosp

* commit '9c3c276afa7e2485e1a9f47e29ada8cb61b7b07c':
  New section header and divider assets.
2009-10-07 11:53:32 -07:00
Bjorn Bringert
fd336acdeb am 030b2cf1: Merge change I76d7ba61 into eclair
Merge commit '030b2cf1eaab25890aa97e7e2a660ff5998e8639' into eclair-plus-aosp

* commit '030b2cf1eaab25890aa97e7e2a660ff5998e8639':
  Pixel tweak search dialog to match search widget
2009-10-07 11:52:57 -07:00
Xavier Ducrohet
8a87df89a2 am 841a8eea: Merge change I24895c35 into eclair
Merge commit '841a8eea78479ad8a3c10e69a788adbeaef5a53d' into eclair-plus-aosp

* commit '841a8eea78479ad8a3c10e69a788adbeaef5a53d':
  Reimplement all the method of Paint for layoutlib
2009-10-07 11:52:46 -07:00
Marco Nelissen
e3b20f4db3 am c39d2e3c: Music visualizer support hack. This currently assumes 44k stereo (won\'t crash on other formats, but won\'t give the correct results either), and links statically with libspeex to get FFT data, increasing the size of libmedia by about 45kb.
Merge commit 'c39d2e3c012fb96999991e30659a474f9f30f789' into eclair-plus-aosp

* commit 'c39d2e3c012fb96999991e30659a474f9f30f789':
  Music visualizer support hack.
2009-10-07 11:52:39 -07:00
Nick Pelly
9a9a038c64 am 52cde727: Fix docs builds.
Merge commit '52cde7279bad58285704498eea57bdaf9e595b49' into eclair-plus-aosp

* commit '52cde7279bad58285704498eea57bdaf9e595b49':
  Fix docs builds.
2009-10-07 11:51:54 -07:00
Nick Pelly
9dfc955a4d am 24bb9b8a: Provide an API for apps to use a dynamic RFCOMM channel and SDP record.
Merge commit '24bb9b8af4ff691538fe9e517e8156016b0da6cd' into eclair-plus-aosp

* commit '24bb9b8af4ff691538fe9e517e8156016b0da6cd':
  Provide an API for apps to use a dynamic RFCOMM channel and SDP record.
2009-10-07 11:51:42 -07:00
Mike Lockwood
1a1b8e2144 am 7fdd67d3: Merge change I5b650a61 into eclair
Merge commit '7fdd67d3867ecbb6457a560b2428a8e9464d8ecd' into eclair-plus-aosp

* commit '7fdd67d3867ecbb6457a560b2428a8e9464d8ecd':
  dumpstate: Emit a logcat message at beginning and end of execution.
2009-10-07 11:51:15 -07:00
Tammo Spalink
14876b739f am 5c8dba21: Merge change I61aac7b3 into eclair
Merge commit '5c8dba21bf5e6a54f848c2e7f46dc86c27a09102' into eclair-plus-aosp

* commit '5c8dba21bf5e6a54f848c2e7f46dc86c27a09102':
  Add PERIOD char to CDMA address sugar list.
2009-10-07 11:50:39 -07:00
Fred Quintana
0f680e8365 am 5fbaefc3: Merge change I4db3a5b3 into eclair
Merge commit '5fbaefc3d8840aac12b16458347b3c1ddbdaf542' into eclair-plus-aosp

* commit '5fbaefc3d8840aac12b16458347b3c1ddbdaf542':
  fix a javadoc build breakage
2009-10-07 11:49:56 -07:00
Xavier Ducrohet
16d90a0082 am a970bf52: Merge change I34f51342 into eclair
Merge commit 'a970bf52581667e88d82e0801e0774d7c9cdcb8f' into eclair-plus-aosp

* commit 'a970bf52581667e88d82e0801e0774d7c9cdcb8f':
  Fix the layoutlib test to run from adt-tests.
2009-10-07 11:49:10 -07:00
Dianne Hackborn
2b57570ab4 am 68d881cf: Fix issue #2166755: BroadcastReceiver trying to return result during a non-ordered broadcast
Merge commit '68d881cf2d2b252f6f795cd64d43e316a1d736e5' into eclair-plus-aosp

* commit '68d881cf2d2b252f6f795cd64d43e316a1d736e5':
  Fix issue #2166755: BroadcastReceiver trying to return result during a non-ordered broadcast
2009-10-07 11:49:01 -07:00
Xavier Ducrohet
a9ee4e2d0b am 71060f29: Merge change I8874a405 into eclair
Merge commit '71060f29855745893c122e8b93cf7a723186931b' into eclair-plus-aosp

* commit '71060f29855745893c122e8b93cf7a723186931b':
  Refactor class/method names used by layoutlib_create.
2009-10-07 11:48:54 -07:00
Romain Guy
1475692e16 am 89c76843: Merge change I9b771df3 into eclair
Merge commit '89c768435fc48a93c0af97f9f08e57a346b0a9fd' into eclair-plus-aosp

* commit '89c768435fc48a93c0af97f9f08e57a346b0a9fd':
  Make sure AsyncTask sens a null result to onPostExecute() when cancelled.
2009-10-07 11:48:44 -07:00
Fred Quintana
f8979bfc08 am 24f32b32: Merge change I89c40f50 into eclair
Merge commit '24f32b32f96eab8645a3ccf429c3d5694d2134ad' into eclair-plus-aosp

* commit '24f32b32f96eab8645a3ccf429c3d5694d2134ad':
  fix a javadoc build breakage
2009-10-07 11:48:03 -07:00
Bjorn Bringert
b6a657610c am 9e4c8561: Merge change I8d48149c into eclair
Merge commit '9e4c85614c861f095131ffa76e65cbba55d03d0a' into eclair-plus-aosp

* commit '9e4c85614c861f095131ffa76e65cbba55d03d0a':
  Don't reinflate search bar when dialog is already showing
2009-10-07 11:47:28 -07:00
Dianne Hackborn
635e2c8a49 am 9830a4ac: Fix issue #2161169: onStop not being called.
Merge commit '9830a4ac42c9e16db91d1de6120cc2eb613fc946' into eclair-plus-aosp

* commit '9830a4ac42c9e16db91d1de6120cc2eb613fc946':
  Fix issue #2161169: onStop not being called.
2009-10-07 11:47:17 -07:00
Fred Quintana
1b90956aaa am f7ae77cd: account manager api review changes
Merge commit 'f7ae77cd67f1a3993b8e56c1af4720a7adf4e69d' into eclair-plus-aosp

* commit 'f7ae77cd67f1a3993b8e56c1af4720a7adf4e69d':
  account manager api review changes
2009-10-07 11:46:24 -07:00
Dianne Hackborn
d6296c7d76 am 48e6725c: Merge change Iaca22686 into eclair
Merge commit '48e6725c828a8d420d43925b0c9a9a915a8c4e2f' into eclair-plus-aosp

* commit '48e6725c828a8d420d43925b0c9a9a915a8c4e2f':
  Work on issue #2163789: Way too much logging
2009-10-07 11:44:12 -07:00
Dianne Hackborn
874cd2af76 am cbc52b7b: Merge change Iee638412 into eclair
Merge commit 'cbc52b7bcbea7dc6ae3b7cfc84fd44ae86711910' into eclair-plus-aosp

* commit 'cbc52b7bcbea7dc6ae3b7cfc84fd44ae86711910':
  Fix issue #2161726: Car dock app bypasses setup wizard
2009-10-07 11:43:54 -07:00
Scott Main
285f0ab9c5 am 87d5004d: am e9e1cdd5: decode the search string before putting it into the search control. this fixes a safari-only bug in which encoded chars were inserted into the search string.
Merge commit '87d5004d3b62441a55b2aba870e4276af6c771eb' into eclair-plus-aosp

* commit '87d5004d3b62441a55b2aba870e4276af6c771eb':
  decode the search string before putting it into the search control.
2009-10-07 11:43:46 -07:00
Mike Lockwood
076873cfcc am 2ecf3f5e: dumpstate: Add backlight information to bugreport output.
Merge commit '2ecf3f5e00ea2ac630ffb405baba33113596cf38' into eclair-plus-aosp

* commit '2ecf3f5e00ea2ac630ffb405baba33113596cf38':
  dumpstate: Add backlight information to bugreport output.
2009-10-07 11:43:27 -07:00
Mathias Agopian
694a930fdb am f8e4bc9f: Merge change I0c4cec7e into eclair
Merge commit 'f8e4bc9f7789b98b54fe04df56555ca8c630df70' into eclair-plus-aosp

* commit 'f8e4bc9f7789b98b54fe04df56555ca8c630df70':
  Attempt to fix [2152536] ANR in browser
2009-10-07 11:42:52 -07:00
Jason Sams
1bf8ee35ea am 8df16d63: Merge change I7f047786 into eclair
Merge commit '8df16d63d4e1c70cf75a9acc4f24e4e1abca5abc' into eclair-plus-aosp

* commit '8df16d63d4e1c70cf75a9acc4f24e4e1abca5abc':
  Update the SimpleMesh API to support new attribute types.  Also spilt add/set commands to avoid permutation explosion.
2009-10-07 11:42:19 -07:00
Dmitri Plotnikov
87d470b04b am 82e863d8: Merge change Ic0d82ef1 into eclair
Merge commit '82e863d8ab5166fec3dce96ae865d1e2d3bbc021' into eclair-plus-aosp

* commit '82e863d8ab5166fec3dce96ae865d1e2d3bbc021':
  [Issue 2161366] Changing capitalization of string "Via" to "via"
2009-10-07 11:41:35 -07:00
San Mehat
c8f3fe56b7 am 7b16834a: Merge change Iaf686344 into eclair
Merge commit '7b16834adc1003f492cd2be4b1bcc3fb73a78c23' into eclair-plus-aosp

* commit '7b16834adc1003f492cd2be4b1bcc3fb73a78c23':
  dumpstate: Display mtime instead of ctime
2009-10-07 11:40:16 -07:00
Wei Huang
bbe63191d3 am 6b370745: bug 2161715: add the .jpg extension to the temp sdcard image file name so MMS can read the JPEG data using a file uri.
Merge commit '6b3707452c5921c89258371eec140b0fb76766f8' into eclair-plus-aosp

* commit '6b3707452c5921c89258371eec140b0fb76766f8':
  bug 2161715: add the .jpg extension to the temp sdcard image file name so MMS can read the JPEG data using a file uri.
2009-10-07 11:39:59 -07:00
Mike Cleron
667b9889d6 am df64cb41: Merge change I80ce8833 into eclair
Merge commit 'df64cb41fb44d56957cba8e375788d98af7bd8b4' into eclair-plus-aosp

* commit 'df64cb41fb44d56957cba8e375788d98af7bd8b4':
  Icons again
2009-10-07 11:37:47 -07:00
David Brown
276e5e5017 am 88e03757: RotarySelector widget: add callback for "grabbed" state changes.
Merge commit '88e037577f7db140e4ef88b77eefaa910e06e5f5' into eclair-plus-aosp

* commit '88e037577f7db140e4ef88b77eefaa910e06e5f5':
  RotarySelector widget: add callback for "grabbed" state changes.
2009-10-07 11:37:40 -07:00
Eric Fischer
09385264eb am 3d7bb3a5: Merge change I3ca8fb69 into eclair
Merge commit '3d7bb3a5e49b559725bba84390b1021d9c527347' into eclair-plus-aosp

* commit '3d7bb3a5e49b559725bba84390b1021d9c527347':
  Import revised translations.  DO NOT MERGE
2009-10-07 11:36:17 -07:00
Android (Google) Code Review
b1219016f1 Merge change I9db1edea into eclair
* changes:
  Import revised translations.   DO NOT MERGE
2009-10-07 14:36:15 -04:00
Jaikumar Ganesh
8a953e861b am d453fe67: Merge change I5dbd1994 into eclair
Merge commit 'd453fe6709c4d28350e34fa39b4fe73d98a36a0c' into eclair-plus-aosp

* commit 'd453fe6709c4d28350e34fa39b4fe73d98a36a0c':
  Fix rfcomm socket connect return code.
2009-10-07 11:35:03 -07:00
Mathias Agopian
b963e88475 am 4ac45597: Merge change I15b0ebb9 into eclair
Merge commit '4ac45597fb70ca4f268cb1920fcb2de61aff4a3d' into eclair-plus-aosp

* commit '4ac45597fb70ca4f268cb1920fcb2de61aff4a3d':
  a simple test app for gralloc
2009-10-07 11:34:37 -07:00
Joe Onorato
cb2d8f2508 am d14cfc27: Merge change I9e384ddd into eclair
Merge commit 'd14cfc27627107c2973eeacc3bcbb2830a3fd620' into eclair-plus-aosp

* commit 'd14cfc27627107c2973eeacc3bcbb2830a3fd620':
  Add a test pattern as rollo's icon
2009-10-07 11:34:16 -07:00
John Wang
2ea877077d am 99510681: Unhide constant DATA_ACTIVITY_DORMANT.
Merge commit '99510681e9f1c76f82719e724990f744cfdbcefd' into eclair-plus-aosp

* commit '99510681e9f1c76f82719e724990f744cfdbcefd':
  Unhide constant DATA_ACTIVITY_DORMANT.
2009-10-07 11:34:09 -07:00
Android (Google) Code Review
b4055a63dc Merge change I2c5f1e76 into eclair
* changes:
  Fix back button handling in ACTV
2009-10-07 01:55:33 -04:00
Mathias Agopian
67838bc112 Revert "temporarily disable the use of glTexImage2D for sw buffers on sholes."
This reverts commit c131c5671965b69b0dee3e4afa3b3dd5e3c0c405.

Approved by Hiroshi
2009-10-06 22:23:23 -07:00
Android (Google) Code Review
21fd586f18 Merge change I3429f77a into eclair
* changes:
  Suppress flaky test HeapTest#testOomeLarge.
2009-10-06 22:35:27 -04:00
Android (Google) Code Review
c87104f17c Merge change I4961c959 into eclair
* changes:
  fix [2152536] ANR in browser
2009-10-06 22:10:17 -04:00