Commit Graph

4703 Commits

Author SHA1 Message Date
Android (Google) Code Review
d83b44d831 Merge change 23271 into eclair
* changes:
  Cleanup egregious style issues.
2009-08-31 19:45:05 -07:00
Tammo Spalink
32a67a1849 am 650cbfd3: Merge change 22551 into eclair
Merge commit '650cbfd3815382df1a82c52297f641bfe9cc4f73' into eclair-plus-aosp

* commit '650cbfd3815382df1a82c52297f641bfe9cc4f73':
  Fix broken unit test.
2009-08-31 19:42:23 -07:00
Android (Google) Code Review
045a8839a1 Merge change 22551 into eclair
* changes:
  Fix broken unit test.
2009-08-31 19:39:40 -07:00
Scott Main
559cf47b7c am 2bd4326a: am 5126d3a3: docs only. revise samples link for offline docs to point to the current version
Merge commit '2bd4326a4694ea3055dc758c05533c905ad78291' into eclair-plus-aosp

* commit '2bd4326a4694ea3055dc758c05533c905ad78291':
  docs only.
2009-08-31 19:03:05 -07:00
Scott Main
7185132c5a am 5126d3a3: docs only. revise samples link for offline docs to point to the current version
Merge commit '5126d3a3794c8c5e1e61621daa5e9dab050b44a1' into eclair

* commit '5126d3a3794c8c5e1e61621daa5e9dab050b44a1':
  docs only.
2009-08-31 19:00:45 -07:00
Fred Quintana
00678723df am 34b6a27e: Merge change 23375 into eclair
Merge commit '34b6a27ea38adeea54a488efc6bbd04c58cb8a91' into eclair-plus-aosp

* commit '34b6a27ea38adeea54a488efc6bbd04c58cb8a91':
  re-enable cancelation of the sync thread upon receipt of ISyncAdapter.cancelSync()
2009-08-31 18:53:12 -07:00
Android (Google) Code Review
bd9d6651de Merge change 23375 into eclair
* changes:
  re-enable cancelation of the sync thread upon receipt of ISyncAdapter.cancelSync()
2009-08-31 18:51:04 -07:00
Xavier Ducrohet
ec7d8f482f am e23ef102: Merge change 23363 into eclair
Merge commit 'e23ef1023a4e4bd91a68c41c81ba273656a2c3a7' into eclair-plus-aosp

* commit 'e23ef1023a4e4bd91a68c41c81ba273656a2c3a7':
  Add error output to pm for FAILED_MISSING_FEATURE
2009-08-31 18:16:31 -07:00
Android (Google) Code Review
e35be14a5f Merge change 23363 into eclair
* changes:
  Add error output to pm for FAILED_MISSING_FEATURE
2009-08-31 18:13:24 -07:00
Romain Guy
19c902f161 am 0f44220b: Merge change 23381 into eclair
Merge commit '0f44220b34e346ef333cdb4cd4b4903b5212dad2' into eclair-plus-aosp

* commit '0f44220b34e346ef333cdb4cd4b4903b5212dad2':
  Prevent ListView from scrolling/flinging its content when the content fits on screen.
2009-08-31 17:48:14 -07:00
Android (Google) Code Review
ff309964c4 Merge change 23381 into eclair
* changes:
  Prevent ListView from scrolling/flinging its content when the content fits on screen.
2009-08-31 17:46:47 -07:00
Jack Palevich
e589d52b08 am ad822197: Merge change 23380 into eclair
Merge commit 'ad82219718cd1751dcf84bab0cd1aedcb6805eb1' into eclair-plus-aosp

* commit 'ad82219718cd1751dcf84bab0cd1aedcb6805eb1':
  Change util_texSubImage2D to call glCompressedTexImage2D correctly.
2009-08-31 17:46:42 -07:00
Android (Google) Code Review
b5f85300f3 Merge change 23380 into eclair
* changes:
  Change util_texSubImage2D to call glCompressedTexImage2D correctly.
2009-08-31 17:45:03 -07:00
Joe Onorato
fe0969a8cb am ae209acd: Don\'t leak jni refs.
Merge commit 'ae209acd8d48755df7d49459b1bcbc3b8e20561d' into eclair-plus-aosp

* commit 'ae209acd8d48755df7d49459b1bcbc3b8e20561d':
  Don't leak jni refs.
2009-08-31 17:28:13 -07:00
Fred Quintana
0bd7470036 am ec5d9fb4: Merge change 23370 into eclair
Merge commit 'ec5d9fb47d180d84e3eff0b2138966579be6ac00' into eclair-plus-aosp

* commit 'ec5d9fb47d180d84e3eff0b2138966579be6ac00':
  Revert "- don't schedule syncs that we will never dispatch"
2009-08-31 17:26:43 -07:00
Android (Google) Code Review
ccf849deb8 Merge change 23370 into eclair
* changes:
  Revert "- don't schedule syncs that we will never dispatch"
2009-08-31 17:24:17 -07:00
Romain Guy
6f8b837158 am f428f8ae: Merge change 23329 into eclair
Merge commit 'f428f8aecea9ae7a258dfc05f4ad4563938f1ed5' into eclair-plus-aosp

* commit 'f428f8aecea9ae7a258dfc05f4ad4563938f1ed5':
  Load bitmap resources entirely from native code.
2009-08-31 17:17:13 -07:00
Android (Google) Code Review
1873627527 Merge change 23329 into eclair
* changes:
  Load bitmap resources entirely from native code.
2009-08-31 17:15:42 -07:00
Jaikumar Ganesh
ca8d0b56ad am c91ad28f: Merge change 23218 into eclair
Merge commit 'c91ad28ff9173971c1d886f884250b1e774a40a6' into eclair-plus-aosp

* commit 'c91ad28ff9173971c1d886f884250b1e774a40a6':
  Fix property being cleared when DeviceFound signal is received.
2009-08-31 16:54:37 -07:00
Android (Google) Code Review
aa4b7de121 Merge change 23218 into eclair
* changes:
  Fix property being cleared when DeviceFound signal is received.
2009-08-31 16:52:38 -07:00
Andreas Huber
81a77ff3f7 am bf1071c0: Merge change 23356 into eclair
Merge commit 'bf1071c07979b03a9f5e8281aba82ed05513185e' into eclair-plus-aosp

* commit 'bf1071c07979b03a9f5e8281aba82ed05513185e':
  Temporarily unlock our mutex while fetching a buffer from the upstream source.
2009-08-31 16:47:09 -07:00
Android (Google) Code Review
e7a419e7fa Merge change 23356 into eclair
* changes:
  Temporarily unlock our mutex while fetching a buffer from the upstream source.
2009-08-31 16:44:46 -07:00
Daisuke Miyakawa
017a38e2fc am 450ff8a4: Merge change 23357 into eclair
Merge commit '450ff8a48c9b78729332c99d680560b583f17e7d' into eclair-plus-aosp

* commit '450ff8a48c9b78729332c99d680560b583f17e7d':
  Fix double-free problem in EmojiFactory.
2009-08-31 16:35:42 -07:00
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