Commit Graph

6386 Commits

Author SHA1 Message Date
Android (Google) Code Review
4f23490970 Merge change Ieed8be00 into eclair
* changes:
  Introduce BluetoothAdapter.getDefaultAdapter().
2009-10-07 19:26:59 -04:00
Nick Pelly
758c593ac0 am dc2ccb82: Merge change Ia4879943 into eclair
Merge commit 'dc2ccb82f96b6a7be7a7b262b81d3aa1422f46fa' into eclair-plus-aosp

* commit 'dc2ccb82f96b6a7be7a7b262b81d3aa1422f46fa':
  Encourage developers to connect RFCOMM by UUID instead of Channel.
2009-10-07 15:12:53 -07:00
Android (Google) Code Review
dcdd8ba3be Merge change Ia4879943 into eclair
* changes:
  Encourage developers to connect RFCOMM by UUID instead of Channel.
2009-10-07 18:04:45 -04:00
Romain Guy
21c3521c6c am 35b38cef: Improve drawing cache speed by selecting the correct opacity and keeping a 32 bits format when the window is 32 bits.
Merge commit '35b38cefcc92f1ed599a652ac5736ab9e9e75039' into eclair-plus-aosp

* commit '35b38cefcc92f1ed599a652ac5736ab9e9e75039':
  Improve drawing cache speed by selecting the correct opacity and keeping a 32 bits
2009-10-07 14:30:37 -07:00
Mike Reed
408bbadc99 am 64dd5be5: Merge change Ia78b0a2d into eclair
Merge commit '64dd5be583bab8218e54068bbf70edc5fc6087c8' into eclair-plus-aosp

* commit '64dd5be583bab8218e54068bbf70edc5fc6087c8':
  add (hidden) setHasAlpha() to allow clients like the view's cache to hint that a bitmap is opaque.
2009-10-07 12:32:10 -07:00
Android (Google) Code Review
8e53c5595d Merge change Ia78b0a2d into eclair
* changes:
  add (hidden) setHasAlpha() to allow clients like the view's cache to hint that a bitmap is opaque.
2009-10-07 15:22:50 -04:00
Eric Fischer
0117864c17 am e4b6639d: Merge change I9db1edea into eclair
Merge commit 'e4b6639dbcfe9c5a429fb6f216790d69d1b3a6e8' into eclair-plus-aosp

* commit 'e4b6639dbcfe9c5a429fb6f216790d69d1b3a6e8':
  Import revised translations.   DO NOT MERGE
2009-10-07 12:08:26 -07:00
Dianne Hackborn
7c7983a61d am 0c3154d3: Fix issue #2163654: deadlock, runtime restart
Merge commit '0c3154d3fc54a1b3d8358a2932042cca729327b9' into eclair-plus-aosp

* commit '0c3154d3fc54a1b3d8358a2932042cca729327b9':
  Fix issue #2163654: deadlock, runtime restart
2009-10-07 12:08:20 -07:00
Bjorn Bringert
d38e51ac8f am 4625758d: Merge change I2c5f1e76 into eclair
Merge commit '4625758d0b909ccfc9f40b707666b1b21e9e8ffd' into eclair-plus-aosp

* commit '4625758d0b909ccfc9f40b707666b1b21e9e8ffd':
  Fix back button handling in ACTV
2009-10-07 12:01:28 -07:00
Fred Quintana
b191d6e9ae am f038004f: changes from Sync Manager API Review: bug 2164262
Merge commit 'f038004f4a5e4fab18df9c87573ba1e82790c30f' into eclair-plus-aosp

* commit 'f038004f4a5e4fab18df9c87573ba1e82790c30f':
  changes from Sync Manager API Review: bug 2164262
2009-10-07 12:01:18 -07:00
Mathias Agopian
d21a7a1ef7 am 460b60c9: Revert "temporarily disable the use of glTexImage2D for sw buffers on sholes."
Merge commit '460b60c9b064ef02e9eaf56ecf2f266fd7c4089c' into eclair-plus-aosp

* commit '460b60c9b064ef02e9eaf56ecf2f266fd7c4089c':
  Revert "temporarily disable the use of glTexImage2D for sw buffers on sholes."
2009-10-07 12:00:49 -07:00
Brett Chabot
395ba45709 am 773fd131: Merge change I3429f77a into eclair
Merge commit '773fd13130948397cac5178e16d17975a06a738b' into eclair-plus-aosp

* commit '773fd13130948397cac5178e16d17975a06a738b':
  Suppress flaky test HeapTest#testOomeLarge.
2009-10-07 12:00:02 -07:00
Mathias Agopian
33b1ee763b am 26fe45dc: Merge change I4961c959 into eclair
Merge commit '26fe45dcb3df12eda94d93f1473cd6a2f5f345c7' into eclair-plus-aosp

* commit '26fe45dcb3df12eda94d93f1473cd6a2f5f345c7':
  fix [2152536] ANR in browser
2009-10-07 11:59:52 -07:00
Eric Laurent
86c267d5f6 am 62443f5f: Fix issue 2139634: DTMF tones on Sholes popping, hissing (audio latency too high).
Merge commit '62443f5f4517ba17d911975e695f1ab75bfdbf77' into eclair-plus-aosp

* commit '62443f5f4517ba17d911975e695f1ab75bfdbf77':
  Fix issue 2139634: DTMF tones on Sholes popping, hissing (audio latency too high).
2009-10-07 11:59:45 -07:00
Romain Guy
a3f904f163 am c404ed2b: Fix failing unit test; the test was using a deprecated API making it fail on WVGA devices.
Merge commit 'c404ed2be5d29c8932a3d69b53fea4653c9b868b' into eclair-plus-aosp

* commit 'c404ed2be5d29c8932a3d69b53fea4653c9b868b':
  Fix failing unit test; the test was using a deprecated API making it fail on WVGA devices.
2009-10-07 11:59:39 -07:00
Mathias Agopian
5034e2224a am c131c567: temporarily disable the use of glTexImage2D for sw buffers on sholes.
Merge commit 'c131c5671965b69b0dee3e4afa3b3dd5e3c0c405' into eclair-plus-aosp

* commit 'c131c5671965b69b0dee3e4afa3b3dd5e3c0c405':
  temporarily disable the use of glTexImage2D for sw buffers on sholes.
2009-10-07 11:59:33 -07:00
Mathias Agopian
a353231c4c am 9d6a685b: Merge changes I430cf57b,I51f02f67,I464f13f3 into eclair
Merge commit '9d6a685ba939f413a8d3e1e97627593aa1cdf6cb' into eclair-plus-aosp

* commit '9d6a685ba939f413a8d3e1e97627593aa1cdf6cb':
  fix [2168528] enable glTexImage2D code path in SF for software-only buffers
  fix [2168531] have software-only gralloc buffer side-step the HAL
  fix [2167050] glTexImage2D code path buggy in SurfaceFlinger
2009-10-07 11:59:27 -07:00
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