Commit Graph

4280 Commits

Author SHA1 Message Date
Android (Google) Code Review
f36e598194 Merge change 23357 into eclair
* changes:
  Fix double-free problem in EmojiFactory.
2009-08-31 16:33:10 -07:00
Jean-Michel Trivi
a4af17ef7e am 6896aef0: Merge change 23338 into eclair
Merge commit '6896aef0bd3132a64cfdee6c1276c4bbbb25d8e3' into eclair-plus-aosp

* commit '6896aef0bd3132a64cfdee6c1276c4bbbb25d8e3':
  Clean TTS logs: use a common TAG in the TTS service, don't show
2009-08-31 15:40:47 -07:00
Android (Google) Code Review
c9631dc927 Merge change 23338 into eclair
* changes:
  Clean TTS logs: use a common TAG in the TTS service, don't show an error when loading the native synth lib.
2009-08-31 15:39:07 -07:00
Robert Greenwalt
014f4430b2 am 10f8f111: Merge change 23341 into eclair
Merge commit '10f8f11106ccf492e15ee2a6ba2be99ec4578088' into eclair-plus-aosp

* commit '10f8f11106ccf492e15ee2a6ba2be99ec4578088':
  Fix replacement-after-add of resource files in overlay.
2009-08-31 15:20:35 -07:00
Daisuke Miyakawa
29f1993fd8 am f66e2e24: Merge change 23344 into eclair
Merge commit 'f66e2e249d3a72a8db2817e5969b1f118b07dd69' into eclair-plus-aosp

* commit 'f66e2e249d3a72a8db2817e5969b1f118b07dd69':
  Make vCard composer handle null of Photo entry correctly.
2009-08-31 15:20:30 -07:00
Daisuke Miyakawa
ec2f31296d am cedcb135: Merge change 23343 into eclair
Merge commit 'cedcb13547d3c65091ca12b1f69be563af442eb1' into eclair-plus-aosp

* commit 'cedcb13547d3c65091ca12b1f69be563af442eb1':
  Use Email.TYPE_MOBILE
2009-08-31 15:20:25 -07:00
Android (Google) Code Review
81b6e0cc5a Merge change 23341 into eclair
* changes:
  Fix replacement-after-add of resource files in overlay.
2009-08-31 15:18:44 -07:00
Android (Google) Code Review
68619ee89a Merge change 23344 into eclair
* changes:
  Make vCard composer handle null of Photo entry correctly.
2009-08-31 15:18:43 -07:00
Android (Google) Code Review
2eba683fae Merge change 23343 into eclair
* changes:
  Use Email.TYPE_MOBILE
2009-08-31 15:18:28 -07:00
Fred Quintana
d7704ae2f6 am 7cb08acc: Merge change 23066 into eclair
Merge commit '7cb08accdd923e05518f4bacd103bfe68d589e5d' into eclair-plus-aosp

* commit '7cb08accdd923e05518f4bacd103bfe68d589e5d':
  - don't schedule syncs that we will never dispatch
2009-08-31 15:05:12 -07:00
Scott Main
57bb4e0b36 am 9cba48c0: am 728157b4: Merge change 23242 into donut
Merge commit '9cba48c099f7900520252421d738d4eed5997534' into eclair-plus-aosp

* commit '9cba48c099f7900520252421d738d4eed5997534':
  docs only.
2009-08-31 15:05:07 -07:00
Android (Google) Code Review
42e54f2a4d Merge change 23066 into eclair
* changes:
  - don't schedule syncs that we will never dispatch - expedite the INITIALIZATION sync
2009-08-31 15:03:32 -07:00
Scott Main
f4f48c5403 am 728157b4: Merge change 23242 into donut
Merge commit '728157b4af937bc34706b71c21e9d804ca83039d' into eclair

* commit '728157b4af937bc34706b71c21e9d804ca83039d':
  docs only.
2009-08-31 15:02:35 -07:00
Android (Google) Code Review
959b58adf0 Merge change 23242 into donut
* changes:
  docs only. add uses-feature "name" attribute
2009-08-31 15:00:36 -07:00
Nick Pelly
63265a0a8e am 3e59cf7e: Merge change 23335 into eclair
Merge commit '3e59cf7ede6d6c66cbb0b1e1f345cf132972a713' into eclair-plus-aosp

* commit '3e59cf7ede6d6c66cbb0b1e1f345cf132972a713':
  Set RFCOMM SO_SNDBUF size to 70 KB for large RFCOMM writes.
2009-08-31 14:46:52 -07:00
Android (Google) Code Review
f185065ba8 Merge change 23335 into eclair
* changes:
  Set RFCOMM SO_SNDBUF size to 70 KB for large RFCOMM writes.
2009-08-31 14:44:03 -07:00
Jean-Michel Trivi
53113bc60c am 550d48f3: Merge change 23300 into eclair
Merge commit '550d48f3342f01ccf6c310845e8c0b986ab7b506' into eclair-plus-aosp

* commit '550d48f3342f01ccf6c310845e8c0b986ab7b506':
  Add a synchronous stop method to TTS synth engine so that upon its destruction,
2009-08-31 14:14:54 -07:00
Android (Google) Code Review
a308f9b64d Merge change 23300 into eclair
* changes:
  Add a synchronous stop method to TTS synth engine so that upon its destruction, if it was synthesing to a file, the latter can be deleted without still being written to. Clear the hashmap of SpeechItem to be stopped (mKillList) when the speech queue is empty.
2009-08-31 14:12:53 -07:00
Ye Wen
2b4c95269e am 9399a3de: Merge change 23320 into eclair
Merge commit '9399a3de6acb6e598fdceae2684ff9bb9d8c1050' into eclair-plus-aosp

* commit '9399a3de6acb6e598fdceae2684ff9bb9d8c1050':
  Set result code in REMOTE_INTENT receiver for subscribed feeds.
2009-08-31 13:56:23 -07:00
Android (Google) Code Review
4808daff0c Merge change 23320 into eclair
* changes:
  Set result code in REMOTE_INTENT receiver for subscribed feeds.
2009-08-31 13:54:11 -07:00
Yu Shan Emily Lau
3f2ea0cefe am 52d6245b: Merge change 22995 into eclair
Merge commit '52d6245ba2454eab456d609d065283dfa76e8c79' into eclair-plus-aosp

* commit '52d6245ba2454eab456d609d065283dfa76e8c79':
  modified:   res/layout/surface_view.xml
2009-08-31 12:10:07 -07:00
Android (Google) Code Review
c5f021921b Merge change 22995 into eclair
* changes:
  	modified:   res/layout/surface_view.xml 	modified:   src/com/android/mediaframeworktest/MediaFrameworkTest.java 	modified:   src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java         Fixed the async mp3 playback test case and also switch the base activity to full screen.
2009-08-31 12:07:07 -07:00
Daniel Sandler
ccac61d143 am de5cd3d8: Merge change 23289 into eclair
Merge commit 'de5cd3d8646f312987062f46616466ae191aa984' into eclair-plus-aosp

* commit 'de5cd3d8646f312987062f46616466ae191aa984':
  Fix http://b/issue?id=2086835 (unlock pattern graphics misaligned).
2009-08-31 10:09:22 -07:00
Android (Google) Code Review
5579b7fc70 Merge change 23289 into eclair
* changes:
  Fix http://b/issue?id=2086835 (unlock pattern graphics misaligned).
2009-08-31 10:07:10 -07:00
Eric Laurent
624cf24ca5 am f7c7a67d: Merge change 23277 into eclair
Merge commit 'f7c7a67d9b223f92e1884a82d49714cb71ee7d37' into eclair-plus-aosp

* commit 'f7c7a67d9b223f92e1884a82d49714cb71ee7d37':
  Fix issue 2085690: AudioFlinger must properly terminate the input and output threads when destroyed.
2009-08-31 09:40:50 -07:00
Jean-Baptiste Queru
3824299bd1 am 3ad34cac: am 57f03f0b: Merge snapshot version of donut back into the main tree
Merge commit '3ad34cacbc7b990bbe11d90e89c2b50667148d33' into eclair-plus-aosp

* commit '3ad34cacbc7b990bbe11d90e89c2b50667148d33':
  donut snapshot
2009-08-31 09:39:21 -07:00
Android (Google) Code Review
52efda85a7 Merge change 23277 into eclair
* changes:
  Fix issue 2085690: AudioFlinger must properly terminate the input and output threads when destroyed.
2009-08-31 09:38:56 -07:00
Jean-Baptiste Queru
87bd2160c9 am 57f03f0b: Merge snapshot version of donut back into the main tree
Merge commit '57f03f0b5d0228799111651aa6915f7d837d501e' into eclair

* commit '57f03f0b5d0228799111651aa6915f7d837d501e':
  donut snapshot
2009-08-31 09:37:32 -07:00
Jean-Baptiste Queru
9582a469c9 Merge snapshot version of donut back into the main tree 2009-08-31 09:32:35 -07:00
Dmitri Plotnikov
454f646812 am f35bce45: Adding a column to Contacts, which will be used as an additional "soft" identity.
Merge commit 'f35bce45058200ff1209385e63e34fbf59255db6' into eclair-plus-aosp

* commit 'f35bce45058200ff1209385e63e34fbf59255db6':
  Adding a column to Contacts, which will be used as an additional "soft" identity.
2009-08-31 09:22:30 -07:00
Jean-Baptiste Queru
f70254c57c donut snapshot 2009-08-31 09:17:57 -07:00
Eric Laurent
c80b1a0034 Fix issue 2085690: AudioFlinger must properly terminate the input and output threads when destroyed.
Call closeInput() for all inputs and closeOutput() for all outputs before deleting audio hardware in AudioFlinger destructor.
2009-08-31 02:10:20 -07:00
Fred Quintana
8c22879556 am 66360af8: Merge change 23266 into eclair
Merge commit '66360af891ac1b77fa5a48d668bd848c84b6f041' into eclair-plus-aosp

* commit '66360af891ac1b77fa5a48d668bd848c84b6f041':
  disable canceling until the http connection code is understood
2009-08-31 00:24:59 -07:00
Android (Google) Code Review
392f61b0fc Merge change 23266 into eclair
* changes:
  disable canceling until the http connection code is understood
2009-08-31 00:22:42 -07:00
Joe Onorato
fae215aa77 am 56d8eeae: applications are at level 2
Merge commit '56d8eeae6f863771d759448d45f7ce75aef73b21' into eclair-plus-aosp

* commit '56d8eeae6f863771d759448d45f7ce75aef73b21':
  applications are at level 2
2009-08-30 16:57:46 -07:00
Joe Onorato
30487fbd04 am 1553c82e: Add a flag (-G) to aapt to have it output the classes that shouldn\'t be obfuscated by ProGuard.
Merge commit '1553c82e084ac5763fb393857224145506771b99' into eclair-plus-aosp

* commit '1553c82e084ac5763fb393857224145506771b99':
  Add a flag (-G) to aapt to have it output the classes that shouldn't be obfuscated by ProGuard.
2009-08-30 16:57:41 -07:00
Mike Lockwood
71d28c3e40 am b0a05404: Merge change 23223 into eclair
Merge commit 'b0a054048329c31948c2f5dbcc11b6f99e454177' into eclair-plus-aosp

* commit 'b0a054048329c31948c2f5dbcc11b6f99e454177':
  SensorService: call close_data_source when we have no more sensor clients.
2009-08-30 13:36:17 -07:00
Android (Google) Code Review
13dc47748e Merge change 23223 into eclair
* changes:
  SensorService: call close_data_source when we have no more sensor clients.
2009-08-30 13:33:57 -07:00
Mike Lockwood
5761b40696 am 2d93a116: Merge change 23187 into eclair
Merge commit '2d93a11663d1d872bc7e9d6512a445fa84148583' into eclair-plus-aosp

* commit '2d93a11663d1d872bc7e9d6512a445fa84148583':
  Do not send dock state changed broadcasts until the system has finished booting.
2009-08-30 12:03:24 -07:00
Android (Google) Code Review
524fef60ff Merge change 23187 into eclair
* changes:
  Do not send dock state changed broadcasts until the system has finished booting.
2009-08-30 12:02:07 -07:00
Dianne Hackborn
5b9fded0b9 am f810d1a8: Put vibration patterns in resources.
Merge commit 'f810d1a88b2d3166064c4a36d8cc9314f02094e0' into eclair-plus-aosp

* commit 'f810d1a88b2d3166064c4a36d8cc9314f02094e0':
  Put vibration patterns in resources.
2009-08-30 11:08:50 -07:00
Dianne Hackborn
014c5cd98e am 284ac93a: More work on wallpapers: animations, lifecycle, scaling, etc.
Merge commit '284ac93aa30642fda87d5c40263a1263677c21cd' into eclair-plus-aosp

* commit '284ac93aa30642fda87d5c40263a1263677c21cd':
  More work on wallpapers: animations, lifecycle, scaling, etc.
2009-08-30 10:57:59 -07:00
Jeff Sharkey
9b0c0c2e23 am cfff8f22: Merge change 23244 into eclair
Merge commit 'cfff8f2291881acb3b3400cd2a0f644c451c2f53' into eclair-plus-aosp

* commit 'cfff8f2291881acb3b3400cd2a0f644c451c2f53':
  Add mobile Email type.
2009-08-29 15:57:04 -07:00
Android (Google) Code Review
8f63637101 Merge change 23244 into eclair
* changes:
  Add mobile Email type.
2009-08-29 15:55:12 -07:00
Scott Main
ba041e46b5 am d2227277: am a84a26d2: Merge change 23241 into donut
Merge commit 'd2227277d405fc368c1baf1a80c2d600dca96145' into eclair-plus-aosp

* commit 'd2227277d405fc368c1baf1a80c2d600dca96145':
  add searchable dictionary to html docs and dev guide nav
2009-08-29 13:43:32 -07:00
Scott Main
e4a4566fbf am a84a26d2: Merge change 23241 into donut
Merge commit 'a84a26d2afab503ed32e6ecc94acba46a5eb9eb3' into eclair

* commit 'a84a26d2afab503ed32e6ecc94acba46a5eb9eb3':
  add searchable dictionary to html docs and dev guide nav
2009-08-29 13:40:53 -07:00
Android (Google) Code Review
7b06c7a416 Merge change 23241 into donut
* changes:
  add searchable dictionary to html docs and dev guide nav and add screenshots.
2009-08-29 13:38:17 -07:00
Fred Quintana
da9a86fd19 am 56f67d21: add the ability to specify yieldpoints in a ContentProviderOperation
Merge commit '56f67d21459ad3f136c73c8932904d4a495989c0' into eclair-plus-aosp

* commit '56f67d21459ad3f136c73c8932904d4a495989c0':
  add the ability to specify yieldpoints in a ContentProviderOperation
2009-08-28 17:04:07 -07:00
Mike LeBeau
0e3fc09e21 am cc927375: am af0b780a: Merge change 23198 into donut
Merge commit 'cc927375cea38f44d810d9dd5ba87abb624d7e0c' into eclair-plus-aosp

* commit 'cc927375cea38f44d810d9dd5ba87abb624d7e0c':
  Update SearchManager documentation to reflect latest behavior.
2009-08-28 16:17:54 -07:00
Mike LeBeau
0a257d15d3 am af0b780a: Merge change 23198 into donut
Merge commit 'af0b780ac6305eb6b6795cb8139ae051e13dd7ff' into eclair

* commit 'af0b780ac6305eb6b6795cb8139ae051e13dd7ff':
  Update SearchManager documentation to reflect latest behavior.
2009-08-28 16:15:58 -07:00