Commit Graph

6066 Commits

Author SHA1 Message Date
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
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
8ca6c38ceb Merge change I9b771df3 into eclair
* changes:
  Make sure AsyncTask sens a null result to onPostExecute() when cancelled.
2009-10-05 18:28:26 -04:00
Android (Google) Code Review
8bdf7aff38 Merge change I89c40f50 into eclair
* changes:
  fix a javadoc build breakage
2009-10-05 17:23:13 -04:00
Android (Google) Code Review
e00c273cb8 Merge change I8d48149c into eclair
* changes:
  Don't reinflate search bar when dialog is already showing
2009-10-05 16:15:14 -04:00
Android (Google) Code Review
e3ba5c140e Merge change Iaca22686 into eclair
* changes:
  Work on issue #2163789: Way too much logging
2009-10-04 18:35:24 -04:00
Android (Google) Code Review
5053fcd11e Merge change Iee638412 into eclair
* changes:
  Fix issue #2161726: Car dock app bypasses setup wizard
2009-10-04 18:19:29 -04:00
Scott Main
b5e834ca25 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 'e9e1cdd556b40a04637b7de3d839b2a596df47e3' into eclair

* commit 'e9e1cdd556b40a04637b7de3d839b2a596df47e3':
  decode the search string before putting it into the search control.
2009-10-04 15:05:43 -07:00
Android (Google) Code Review
0b7b65da2f Merge change I0c4cec7e into eclair
* changes:
  Attempt to fix [2152536] ANR in browser
2009-10-02 23:35:12 -04:00
Android (Google) Code Review
09fa0b2d73 Merge change I7f047786 into eclair
* changes:
  Update the SimpleMesh API to support new attribute types.  Also spilt add/set commands to avoid permutation explosion.
2009-10-02 21:40:07 -04:00
Mathias Agopian
0b3ad46a26 Attempt to fix [2152536] ANR in browser
The ANR is caused by SurfaceFlinger waiting for buffers of a removed surface to become availlable.
When it is removed from the current list, a Surface is marked as NO_INIT, which causes SF to return
immediately in the above case. For some reason, the surface here wasn't marked as NO_INIT.

This change makes the code more robust by always (irregadless or errors) setting the NO_INIT status
in all code paths where a surface is removed from the list.

Additionaly added more information in the logs, should this happen again.
2009-10-02 18:12:30 -07:00
Android (Google) Code Review
b3e869c7a8 Merge change Ic0d82ef1 into eclair
* changes:
  [Issue 2161366] Changing capitalization of string "Via" to "via"
2009-10-02 19:17:30 -04:00
Android (Google) Code Review
c91af0c12e Merge change Iaf686344 into eclair
* changes:
  dumpstate: Display mtime instead of ctime
2009-10-02 16:34:02 -04:00
Android (Google) Code Review
4d15bec90d Merge change I80ce8833 into eclair
* changes:
  Icons again
2009-10-02 03:51:19 -04:00
Android (Google) Code Review
d835114b97 Merge change I3ca8fb69 into eclair
* changes:
  Import revised translations.  DO NOT MERGE
2009-10-02 00:47:08 -04:00
Android (Google) Code Review
e659abef6d Merge change I5dbd1994 into eclair
* changes:
  Fix rfcomm socket connect return code.
2009-10-01 22:46:23 -04:00
Android (Google) Code Review
c999d3f235 Merge change I15b0ebb9 into eclair
* changes:
  a simple test app for gralloc
2009-10-01 20:25:45 -04:00
Mathias Agopian
7460160b80 a simple test app for gralloc 2009-10-01 17:23:05 -07:00
Android (Google) Code Review
2a307faa64 Merge change I9e384ddd into eclair
* changes:
  Add a test pattern as rollo's icon
2009-10-01 19:49:27 -04:00
Marco Nelissen
77855f7a29 am 9b150b74: Close the cursor before assigning a new one to the same variable.
Merge commit '9b150b74573ce506abd00c692fb42f46980441a3' into eclair-plus-aosp

* commit '9b150b74573ce506abd00c692fb42f46980441a3':
  Close the cursor before assigning a new one to the same variable.
2009-10-01 08:36:00 -07:00
Daniel Sandler
29dd397239 am 87b94b13: Merge change I6e01fa52 into eclair
Merge commit '87b94b13ea8ad708d079ddfafe4801c12c38e57a' into eclair-plus-aosp

* commit '87b94b13ea8ad708d079ddfafe4801c12c38e57a':
  Remove unneeded icon.
2009-10-01 08:10:01 -07:00
Android (Google) Code Review
3431c6cba8 Merge change I6e01fa52 into eclair
* changes:
  Remove unneeded icon.
2009-10-01 11:01:34 -04:00
Michael Chan
ac9dabd315 am 5a463a69: Merge change Ic2a16d4f into eclair
Merge commit '5a463a693cae501f3e65936ea96e1ca1bae5fc3f' into eclair-plus-aosp

* commit '5a463a693cae501f3e65936ea96e1ca1bae5fc3f':
  b/2148252 Fix emulator
2009-10-01 08:00:16 -07:00
Android (Google) Code Review
00dcab7c05 Merge change Ic2a16d4f into eclair
* changes:
  b/2148252 Fix emulator
2009-10-01 10:52:01 -04:00
Mike Reed
ccc70b5842 am bbed0d68: hide setGammaForText, which is only used for calibrating new devices
Merge commit 'bbed0d68c815446400193bdc8b16fbf73e1ee664' into eclair-plus-aosp

* commit 'bbed0d68c815446400193bdc8b16fbf73e1ee664':
  hide setGammaForText, which is only used for calibrating new devices
2009-10-01 06:42:33 -07:00
Jeff Sharkey
855652f2c4 am c00099ef: Change intent flags for launching FastTrack.
Merge commit 'c00099ef62fc496429d0a06e580b600f61304f9c' into eclair-plus-aosp

* commit 'c00099ef62fc496429d0a06e580b600f61304f9c':
  Change intent flags for launching FastTrack.
2009-10-01 05:44:33 -07:00
Mathias Agopian
5db124cb8b am 271cfe85: Merge change Ia8826d67 into eclair
Merge commit '271cfe85ccfa6d94008dcebb3b97108ca325fe59' into eclair-plus-aosp

* commit '271cfe85ccfa6d94008dcebb3b97108ca325fe59':
  improve boot animation a bit
2009-10-01 03:22:36 -07:00
Android (Google) Code Review
3a6e128828 Merge change Ia8826d67 into eclair
* changes:
  improve boot animation a bit
2009-10-01 06:16:25 -04:00
Bjorn Bringert
6c8e8425a4 am a6309c30: On BACK in search, hide just IME if IME is fullscreen
Merge commit 'a6309c30722ad3aee88ddc2394cea2a499168d99' into eclair-plus-aosp

* commit 'a6309c30722ad3aee88ddc2394cea2a499168d99':
  On BACK in search, hide just IME if IME is fullscreen
2009-10-01 03:02:48 -07:00
Bjorn Bringert
10c7cfdb14 am 95c98dd5: Merge change Ie69a9c0a into eclair
Merge commit '95c98dd5fd5920933231c424ff53f91adeee9503' into eclair-plus-aosp

* commit '95c98dd5fd5920933231c424ff53f91adeee9503':
  Remove globalSearch argument from triggerSearch()
2009-10-01 02:20:02 -07:00
Android (Google) Code Review
64005a6ff0 Merge change Ie69a9c0a into eclair
* changes:
  Remove globalSearch argument from triggerSearch()
2009-10-01 05:10:15 -04:00