Jim Miller
90862fb78c
am e15dc6e1: am ca4efac9: am f65161f1: Merge change If933b13d into eclair
...
Merge commit 'e15dc6e19f944889a8d9f3fb97b014aa7d298de9'
* commit 'e15dc6e19f944889a8d9f3fb97b014aa7d298de9':
Fix for 2161835: Tweaks to rotary lock screen:
2009-10-12 11:44:59 -07:00
Jason Sams
ce7bf91ffe
am c5f2aae4: am 9816a5d1: am 968a9571: Merge change I516c3191 into eclair
...
Merge commit 'c5f2aae4da0a0aef635453bbd86b570e46b66bb2'
* commit 'c5f2aae4da0a0aef635453bbd86b570e46b66bb2':
Implement data push from scripts. Fixes the problem where apps would have to poll to monitor a scripts state.
2009-10-12 11:44:49 -07:00
Wu-cheng Li
2f3027adce
am 3616d154: am 80fff7a5: am 962f2536: Merge change I547cff66 into eclair
...
Merge commit '3616d15451734bd3b563d73f9c2f25c19d7df75c'
* commit '3616d15451734bd3b563d73f9c2f25c19d7df75c':
Add zoom functions and sendCommand.
2009-10-12 11:44:39 -07:00
Fred Quintana
99b548ffa2
am 7a5262a6: am 72fc14e8: am f83d9b3f: fix build breakage
...
Merge commit '7a5262a620819e85cdcc6441bf0eb0b05dafe46b'
* commit '7a5262a620819e85cdcc6441bf0eb0b05dafe46b':
fix build breakage
2009-10-12 11:44:28 -07:00
Fred Quintana
ff247d00f5
am 11aaaa70: am 77a7bdce: 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 '11aaaa70b75aa919b385289c5b06bbd20f9e424d'
* commit '11aaaa70b75aa919b385289c5b06bbd20f9e424d':
- hide Entity and all its references
2009-10-12 11:44:16 -07:00
Suchi Amalapurapu
1a09944b30
am 5a535026: am ef3c63ad: am 5163cd6d: Merge change I5be3d603 into eclair
...
Merge commit '5a535026bfc1d091c0d029b21cc63f929c2def0a'
* commit '5a535026bfc1d091c0d029b21cc63f929c2def0a':
Make sdk version and code names static finals in PackageParser.
2009-10-12 11:44:05 -07:00
Daisuke Miyakawa
8dc4105454
am 4613007b: am 629f94fa: am ccc214b2: Merge change I6a0b14bd into eclair
...
Merge commit '4613007b5755ed95a3a649909b4702400863f9b4'
* commit '4613007b5755ed95a3a649909b4702400863f9b4':
Make VCardComposer create the instance for mHandlerList.
2009-10-12 11:41:20 -07:00
Evan Millar
1eb99bd922
am d25a60c9: am 6cd206ab: am 9c3c276a: Merge change I8333dcc4 into eclair
...
Merge commit 'd25a60c95822ffa1e5d1b312791bc7ed2e2817d1'
* commit 'd25a60c95822ffa1e5d1b312791bc7ed2e2817d1':
New section header and divider assets.
2009-10-12 11:40:55 -07:00
Bjorn Bringert
52bb594782
am 66b6dc68: am 2235a020: am 030b2cf1: Merge change I76d7ba61 into eclair
...
Merge commit '66b6dc68ad9aa5c38258bb84259dc23ce5acae24'
* commit '66b6dc68ad9aa5c38258bb84259dc23ce5acae24':
Pixel tweak search dialog to match search widget
2009-10-12 11:40:21 -07:00
Xavier Ducrohet
f94feaea54
am 3557d5bc: am 9cf2bbb0: am 841a8eea: Merge change I24895c35 into eclair
...
Merge commit '3557d5bc9eb8ac33641430ca52d8e2121d0f1a4b'
* commit '3557d5bc9eb8ac33641430ca52d8e2121d0f1a4b':
Reimplement all the method of Paint for layoutlib
2009-10-12 11:40:11 -07:00
Marco Nelissen
f2af7702b6
am 2c3dc14a: am a97402e1: 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
...
Merge commit '2c3dc14acb7308570b9d695ba9ac904a9502b043'
* commit '2c3dc14acb7308570b9d695ba9ac904a9502b043':
Music visualizer support hack.
2009-10-12 11:40:01 -07:00
Nick Pelly
c917eb05d7
am 3f25987d: am d4cf13a6: am 52cde727: Fix docs builds.
...
Merge commit '3f25987d331b1d3585e32131b05351b86ec14b70'
* commit '3f25987d331b1d3585e32131b05351b86ec14b70':
Fix docs builds.
2009-10-12 11:38:48 -07:00
Nick Pelly
16360b2f1f
am a1cb6a64: am 460965c2: am 24bb9b8a: Provide an API for apps to use a dynamic RFCOMM channel and SDP record.
...
Merge commit 'a1cb6a64c6710d46cc8673bc17db3bdb5c7bbc09'
* commit 'a1cb6a64c6710d46cc8673bc17db3bdb5c7bbc09':
Provide an API for apps to use a dynamic RFCOMM channel and SDP record.
2009-10-12 11:38:32 -07:00
Mike Lockwood
bc0af3ff74
am 2d0dee0e: am 0daf3e91: am 7fdd67d3: Merge change I5b650a61 into eclair
...
Merge commit '2d0dee0e6ccebced9eac11dec24fbb66a1a40b2b'
* commit '2d0dee0e6ccebced9eac11dec24fbb66a1a40b2b':
dumpstate: Emit a logcat message at beginning and end of execution.
2009-10-12 11:37:39 -07:00
Tammo Spalink
0356fba5fd
am 7589ae77: am ef5aed64: am 5c8dba21: Merge change I61aac7b3 into eclair
...
Merge commit '7589ae77224a28a2162cde74c3ae8b1d826c635c'
* commit '7589ae77224a28a2162cde74c3ae8b1d826c635c':
Add PERIOD char to CDMA address sugar list.
2009-10-12 11:36:48 -07:00
Fred Quintana
1daf606197
am 70cdb4d6: am 0eb2d838: am 5fbaefc3: Merge change I4db3a5b3 into eclair
...
Merge commit '70cdb4d684e2821b614562fdb868140154db0026'
* commit '70cdb4d684e2821b614562fdb868140154db0026':
fix a javadoc build breakage
2009-10-12 11:35:13 -07:00
Xavier Ducrohet
05e21fb565
am 636d9cd6: am 5becdc32: am a970bf52: Merge change I34f51342 into eclair
...
Merge commit '636d9cd63b77a87e6cb627a90cc8f37e81bedb14'
* commit '636d9cd63b77a87e6cb627a90cc8f37e81bedb14':
Fix the layoutlib test to run from adt-tests.
2009-10-12 11:34:11 -07:00
Dianne Hackborn
f1b7d4d1ac
am 4bc6158d: am baad552d: am 68d881cf: Fix issue #2166755 : BroadcastReceiver trying to return result during a non-ordered broadcast
...
Merge commit '4bc6158d6bdeff796cfd61d489c01db0d203534c'
* commit '4bc6158d6bdeff796cfd61d489c01db0d203534c':
Fix issue #2166755 : BroadcastReceiver trying to return result during a non-ordered broadcast
2009-10-12 11:34:00 -07:00
Xavier Ducrohet
d419c75d89
am 5903a83d: am 864cbf5f: am 71060f29: Merge change I8874a405 into eclair
...
Merge commit '5903a83df1ebca83ce1e9a05f11a21701db48692'
* commit '5903a83df1ebca83ce1e9a05f11a21701db48692':
Refactor class/method names used by layoutlib_create.
2009-10-12 11:33:44 -07:00
Romain Guy
99527d97e1
am e1bf39bc: am cb40ba28: am 89c76843: Merge change I9b771df3 into eclair
...
Merge commit 'e1bf39bc764c78344dd2a6c59c5709919bdc1da9'
* commit 'e1bf39bc764c78344dd2a6c59c5709919bdc1da9':
Make sure AsyncTask sens a null result to onPostExecute() when cancelled.
2009-10-12 11:33:30 -07:00
Fred Quintana
dfb6a176bf
am 4df43ae4: am 7d7ab5ae: am 24f32b32: Merge change I89c40f50 into eclair
...
Merge commit '4df43ae4a793ac81d95c0b50967d444ca2d28ffa'
* commit '4df43ae4a793ac81d95c0b50967d444ca2d28ffa':
fix a javadoc build breakage
2009-10-12 11:32:39 -07:00
Daisuke Miyakawa
ebd41843a7
am 36cad7be: am 07086eb9: Merge change Ifb63d236 into eclair-mr2
...
Merge commit '36cad7be504608a538c845b4a44f0dcee157a338'
* commit '36cad7be504608a538c845b4a44f0dcee157a338':
Add cancel() VCardDataBuilder, which is intended to remove
2009-10-12 11:32:00 -07:00
Bjorn Bringert
4cce63e34c
am a4323999: am 3448b676: am 9e4c8561: Merge change I8d48149c into eclair
...
Merge commit 'a4323999ecfaef42c70eec39b6a8f0bfcfaf2394'
* commit 'a4323999ecfaef42c70eec39b6a8f0bfcfaf2394':
Don't reinflate search bar when dialog is already showing
2009-10-12 11:31:11 -07:00
Dianne Hackborn
c03889cfc3
am 72650c31: am a4a8a88b: am 9830a4ac: Fix issue #2161169 : onStop not being called.
...
Merge commit '72650c31c7f7722836184984678508af95d52519'
* commit '72650c31c7f7722836184984678508af95d52519':
Fix issue #2161169 : onStop not being called.
2009-10-12 11:30:48 -07:00
Grace Kloba
7141e951e0
am 11782b90: am 7fd7534b: Merge change I5101c2b1 into eclair-mr2
...
Merge commit '11782b905292ebde1b591f6561913affdfd415fc'
* commit '11782b905292ebde1b591f6561913affdfd415fc':
Extend the date time to handle the case where the
2009-10-12 11:30:37 -07:00
Fred Quintana
1b05c550a7
am fe9d00bc: am bf13850b: am f7ae77cd: account manager api review changes
...
Merge commit 'fe9d00bc9cf84e7edf67fc6790fd4b05113d5886'
* commit 'fe9d00bc9cf84e7edf67fc6790fd4b05113d5886':
account manager api review changes
2009-10-12 11:29:33 -07:00
Leon Clarke
49937a1790
am 3537b9d8: am adff6542: Make the text bit transparent to allow the correct color to show through
...
Merge commit '3537b9d86ee900424b6a2e98056d837663de7390'
* commit '3537b9d86ee900424b6a2e98056d837663de7390':
Make the text bit transparent to allow the correct color to show through
2009-10-12 11:27:35 -07:00
Patrick Scott
b647c6b2bb
am 8e20e88b: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp
...
Merge commit '8e20e88ba664ff606cd7eb427dd05fd981355410'
* commit '8e20e88ba664ff606cd7eb427dd05fd981355410':
2009-10-12 11:27:24 -07:00
Dianne Hackborn
b61392b149
am 492eb109: am 48e6725c: Merge change Iaca22686 into eclair
...
Merge commit '492eb109ff704c0dfec447a88920657cb230b8d6'
* commit '492eb109ff704c0dfec447a88920657cb230b8d6':
Work on issue #2163789 : Way too much logging
2009-10-12 11:21:30 -07:00
Dianne Hackborn
b8c6aceb7e
am 5d36efda: am cbc52b7b: Merge change Iee638412 into eclair
...
Merge commit '5d36efdaa22c2f7c369afbc97b76a07121c98eb7'
* commit '5d36efdaa22c2f7c369afbc97b76a07121c98eb7':
Fix issue #2161726 : Car dock app bypasses setup wizard
2009-10-12 11:21:16 -07:00
Scott Main
672f003f01
am 13a7d591: 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 '13a7d5917a4f0665cccdfd508351e447e5fadb40'
* commit '13a7d5917a4f0665cccdfd508351e447e5fadb40':
decode the search string before putting it into the search control.
2009-10-12 11:21:04 -07:00
Mike Lockwood
78c17e4b79
am e0461147: am 2ecf3f5e: dumpstate: Add backlight information to bugreport output.
...
Merge commit 'e04611471133650731bcd06229dfd38f3fcdc889'
* commit 'e04611471133650731bcd06229dfd38f3fcdc889':
dumpstate: Add backlight information to bugreport output.
2009-10-12 11:20:51 -07:00
Mathias Agopian
ea2454dc01
am 7c64a89b: am f8e4bc9f: Merge change I0c4cec7e into eclair
...
Merge commit '7c64a89b3c6d05e03bc72df18fbcf34365833b37'
* commit '7c64a89b3c6d05e03bc72df18fbcf34365833b37':
Attempt to fix [2152536] ANR in browser
2009-10-12 11:20:40 -07:00
Jason Sams
52049bb5ca
am b3ac5477: am 8df16d63: Merge change I7f047786 into eclair
...
Merge commit 'b3ac54771e6d5dd2a173797c9daf3efa317fa29d'
* commit 'b3ac54771e6d5dd2a173797c9daf3efa317fa29d':
Update the SimpleMesh API to support new attribute types. Also spilt add/set commands to avoid permutation explosion.
2009-10-12 11:20:29 -07:00
Dmitri Plotnikov
fadc04a5cc
am 022d0b6e: am 82e863d8: Merge change Ic0d82ef1 into eclair
...
Merge commit '022d0b6ede0f9d3d593fa36c81b4694b2c84ac60'
* commit '022d0b6ede0f9d3d593fa36c81b4694b2c84ac60':
[Issue 2161366] Changing capitalization of string "Via" to "via"
2009-10-12 11:20:19 -07:00
San Mehat
c378e13d1e
am 21ee78b3: am 7b16834a: Merge change Iaf686344 into eclair
...
Merge commit '21ee78b372ac38f7844b1877192513ca0388fc82'
* commit '21ee78b372ac38f7844b1877192513ca0388fc82':
dumpstate: Display mtime instead of ctime
2009-10-12 11:20:08 -07:00
Wei Huang
e64dc6469f
am 0200394a: 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 '0200394a0d8da5fd1a34e7366c1e021db8ccb46c'
* commit '0200394a0d8da5fd1a34e7366c1e021db8ccb46c':
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-12 11:19:57 -07:00
Mike Cleron
75c18d5cef
am cfc81aea: am df64cb41: Merge change I80ce8833 into eclair
...
Merge commit 'cfc81aea5d298f6f9e7dc6fbb4d3b2d63a1c47c8'
* commit 'cfc81aea5d298f6f9e7dc6fbb4d3b2d63a1c47c8':
Icons again
2009-10-12 11:19:47 -07:00
David Brown
ec9057e4c9
am fdc8c782: am 88e03757: RotarySelector widget: add callback for "grabbed" state changes.
...
Merge commit 'fdc8c7826aacb51d3d2bd22af5a511add413725d'
* commit 'fdc8c7826aacb51d3d2bd22af5a511add413725d':
RotarySelector widget: add callback for "grabbed" state changes.
2009-10-12 11:19:36 -07:00
Eric Fischer
f44f1edd8c
am 0363f94e: (-s ours) am 3d7bb3a5: (-s ours) Merge change I3ca8fb69 into eclair
...
Merge commit '0363f94e1aaad084a70ab1683d259b5109ee373f'
* commit '0363f94e1aaad084a70ab1683d259b5109ee373f':
Import revised translations. DO NOT MERGE
2009-10-12 11:19:26 -07:00
Jaikumar Ganesh
9ef11fa0e3
am f2b80d8c: am d453fe67: Merge change I5dbd1994 into eclair
...
Merge commit 'f2b80d8ccc9b8d775eb0171bd8f170f251a7314e'
* commit 'f2b80d8ccc9b8d775eb0171bd8f170f251a7314e':
Fix rfcomm socket connect return code.
2009-10-12 11:19:15 -07:00
Mathias Agopian
360c033029
am c5b09d8a: am 4ac45597: Merge change I15b0ebb9 into eclair
...
Merge commit 'c5b09d8a5f7bbf9545b1f2b2d69920fd115d3ecd'
* commit 'c5b09d8a5f7bbf9545b1f2b2d69920fd115d3ecd':
a simple test app for gralloc
2009-10-12 11:19:04 -07:00
Joe Onorato
e82f9c3cfd
am e0848c0f: am d14cfc27: Merge change I9e384ddd into eclair
...
Merge commit 'e0848c0fc42de089d12b98dc8efeed5002686e40'
* commit 'e0848c0fc42de089d12b98dc8efeed5002686e40':
Add a test pattern as rollo's icon
2009-10-12 11:18:54 -07:00
John Wang
f23e5e48c9
am dcd1fe5f: am 99510681: Unhide constant DATA_ACTIVITY_DORMANT.
...
Merge commit 'dcd1fe5fc8c51b977e80dc3d8856de7572728dcf'
* commit 'dcd1fe5fc8c51b977e80dc3d8856de7572728dcf':
Unhide constant DATA_ACTIVITY_DORMANT.
2009-10-12 11:18:43 -07:00
Jack Palevich
791212da2b
am 7d638292: Merge change Ib4285d22 into eclair-mr2
...
Merge commit '7d638292969687ed4557d36e741e1275d2052fb0'
* commit '7d638292969687ed4557d36e741e1275d2052fb0':
Change way we choose EGL surfaces to be compatible with the native
2009-10-12 11:18:32 -07:00
Leon Scroggins
8b6c45b881
am fde23e39: Merge change Ic66f68a7 into eclair-mr2
...
Merge commit 'fde23e398e9b880eec6269adf5afaca1f58e58f7'
* commit 'fde23e398e9b880eec6269adf5afaca1f58e58f7':
Fix a null pointer exception caught by the monkey.
2009-10-12 11:18:21 -07:00
Grace Kloba
114d254631
am 9eca703d: Merge change I499a9541 into eclair-mr2
...
Merge commit '9eca703d08ef2ef81796519fdd60a774380c7d4c'
* commit '9eca703d08ef2ef81796519fdd60a774380c7d4c':
setupRedirect() can throw. Catch it and signal the error.
2009-10-12 11:18:08 -07:00
Patrick Scott
4e5552ba4a
am 86806ce1: Process synchronous requests in the same RequestQueue.
...
Merge commit '86806ce11a89260147d7c2efa2c192b711d923db'
* commit '86806ce11a89260147d7c2efa2c192b711d923db':
Process synchronous requests in the same RequestQueue.
2009-10-12 11:17:58 -07:00
Romain Guy
db68f96323
am 18d1255e: Prevents memory leaks by correctly detaching views in AbsListView.
...
Merge commit '18d1255ebe83d73df34832f2197a1e51ea717b96'
* commit '18d1255ebe83d73df34832f2197a1e51ea717b96':
Prevents memory leaks by correctly detaching views in AbsListView.
2009-10-12 10:16:14 -07:00
android-build SharedAccount
9f2b548999
am 7f86d58f: Merge commit \'goog/eclair\' into eclair-release
...
Merge commit '7f86d58f179085f5101fcce154fcd510b2a81089'
* commit '7f86d58f179085f5101fcce154fcd510b2a81089':
2009-10-12 10:16:04 -07:00