Commit Graph

11068 Commits

Author SHA1 Message Date
Mathias Agopian
d86fce3fb4 am 4b0ad135: am 98a9c56a: attempt to work around [2155085, 2150246] stuck in closeTransaction()
Merge commit '4b0ad1359b96e86cbb0827a3e88aade4223587cd'

* commit '4b0ad1359b96e86cbb0827a3e88aade4223587cd':
  attempt to work around [2155085, 2150246] stuck in closeTransaction()
2009-10-01 12:22:03 -07:00
Dianne Hackborn
dffcf5eae9 am e67de076: am a33e3f79: Fix issue #2154794: Force close when start facebook application.
Merge commit 'e67de07627e5a35e499eeefdfb0334b50590d053'

* commit 'e67de07627e5a35e499eeefdfb0334b50590d053':
  Fix issue #2154794: Force close when start facebook application.
2009-10-01 12:21:26 -07:00
Dan Egnor
79ea349e38 am 722d67dc: am 46e462a3: Merge change I852f8e46 into eclair
Merge commit '722d67dcb6bd64ac73a4c1033b3b97c1a3215efe'

* commit '722d67dcb6bd64ac73a4c1033b3b97c1a3215efe':
  Only re-initialize backup state if @pm@ metadata is missing,
2009-10-01 12:20:44 -07:00
Dianne Hackborn
1e17eb3677 am 04e8a925: am 935cbda0: Merge change I174d16a3 into eclair
Merge commit '04e8a925c00ef0a1bf58932b84253ed72daf8404'

* commit '04e8a925c00ef0a1bf58932b84253ed72daf8404':
  Debugging for #2027266: app drawer showing up on the side
2009-10-01 12:19:59 -07:00
Scott Main
621ab2a0e6 am 3f8e158a: am d2c494d9: Merge change I8b2e000c into eclair
Merge commit '3f8e158a9dd27cc4c02be4e55fd51670563217d5'

* commit '3f8e158a9dd27cc4c02be4e55fd51670563217d5':
  add class description and revise descriptions for
2009-10-01 12:19:48 -07:00
Mathias Agopian
0c55f2cfa1 am bab6680c: am e4d51bb2: Merge changes I8851617a,Ie1b6f244,I70cab912,Ibd23e30d into eclair
Merge commit 'bab6680cdeddcf525bd3255f1b22b500bad4ee84'

* commit 'bab6680cdeddcf525bd3255f1b22b500bad4ee84':
  fix [2152247] Windows sometimes drawn scaled up.
  invalidate the surface when the physical changes
  introduce the notion of the requested size in the Layer state
  remove unused code
2009-10-01 12:19:25 -07:00
Daisuke Miyakawa
276fff813f am dfe07a85: am 0100fae1: Merge change I1f7c409e into eclair
Merge commit 'dfe07a850b1125f660cf8c73fdbf0a18df4f58e4'

* commit 'dfe07a850b1125f660cf8c73fdbf0a18df4f58e4':
  Make ContactStruct handle Collection properly.
2009-10-01 12:19:15 -07:00
Amith Yamasani
051713404c am e092e1f5: am 17d262f2: Merge change I69220990 into eclair
Merge commit 'e092e1f531de1fc2985b83c9ec6ff40551e148f0'

* commit 'e092e1f531de1fc2985b83c9ec6ff40551e148f0':
  Fix for 2155255: Revert "Cache inflated view to avoid inflation of layouts in preferences"
2009-10-01 12:19:03 -07:00
Jack Palevich
9e67266d01 am ebed3c54: am bcbca57f: Merge change I5ffd6240 into eclair
Merge commit 'ebed3c54baa40e8e35e08480ec73346898ff4be9'

* commit 'ebed3c54baa40e8e35e08480ec73346898ff4be9':
  Add a simple test of OpenGL ES 1.x.
2009-10-01 12:18:52 -07:00
Megha Joshi
2c80ecd49a am e8501c84: am 523db1c3: Merge change Icf1e2f98 into eclair
Merge commit 'e8501c84f8f7a1d0165c127475a1a6c7499c8c64'

* commit 'e8501c84f8f7a1d0165c127475a1a6c7499c8c64':
  Adds Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET to launch fasttrack intent.
2009-10-01 12:18:40 -07:00
Mathias Agopian
25c266cdb0 am 5bfbe196: am a015c9be: Merge change I45094a34 into eclair
Merge commit '5bfbe19636d1d53ff1754c881f73e1c11c2c31bb'

* commit '5bfbe19636d1d53ff1754c881f73e1c11c2c31bb':
  remove dead code
2009-10-01 12:18:31 -07:00
Daniel Sandler
8d7ca86ce6 am 67918d33: am 15f06995: Merge change I96aad5c6 into eclair
Merge commit '67918d3345ae53e0aa233cc97cda33baba7c1aaa'

* commit '67918d3345ae53e0aa233cc97cda33baba7c1aaa':
  Updated status bar icons.
2009-10-01 12:17:26 -07:00
Romain Guy
7174f15fd7 am 2fbdbb65: am 5392556b: Merge change I5910a70c into eclair
Merge commit '2fbdbb657a1ae591fc69821675124b1fbe6f06c5'

* commit '2fbdbb657a1ae591fc69821675124b1fbe6f06c5':
  Fix documentation.
2009-10-01 12:17:12 -07:00
Andrei Popescu
9af8374e09 am 5b95f833: am 486733c1: Merge change I94856f6d into eclair
Merge commit '5b95f83356f130e138f3e9a26a1580c479eb955d'

* commit '5b95f83356f130e138f3e9a26a1580c479eb955d':
  Update <video> implementation after new IRC discussion with Eric Carlsson.
2009-10-01 12:16:14 -07:00
Romain Guy
d41d29a370 am 7c749f81: am 27d8514f: Merge change I78f113bc into eclair
Merge commit '7c749f81a64f8778af66429dd041fafcce32e503'

* commit '7c749f81a64f8778af66429dd041fafcce32e503':
  Fix possible crash in AutoCompleteTextView.
2009-10-01 12:15:55 -07:00
Nick Pelly
34714f24c9 am 83f86de3: am 285f2422: Merge change I28bad882 into eclair
Merge commit '83f86de3de60ea24462a0e04a09ddb4a435966c9'

* commit '83f86de3de60ea24462a0e04a09ddb4a435966c9':
  Fix broken build.
2009-10-01 12:15:14 -07:00
Amith Yamasani
b9174e0239 am 2fe7c9e5: am 86aece8b: Merge change I8dfd6ea8 into eclair
Merge commit '2fe7c9e51a5dd29be011fa618e74ad2c79b0d42d'

* commit '2fe7c9e51a5dd29be011fa618e74ad2c79b0d42d':
  Handle bad lines in /proc/wakelocks : Fix for 2124260
2009-10-01 12:14:46 -07:00
Evan Millar
b6fc6f225a am 09aa95bf: am 1537a255: Merge change I46a6d39c into eclair
Merge commit '09aa95bff32f5bc965bec63cd70443c1c0ff145d'

* commit '09aa95bff32f5bc965bec63cd70443c1c0ff145d':
  Remove unused api in QuickContact.java and fix the build.
2009-10-01 12:14:35 -07:00
Daisuke Miyakawa
832fa33955 am 367e1af2: am 255d51cc: Merge change Ia6fc04c8 into eclair
Merge commit '367e1af28754dd952a8da6f262c41dc5004c2366'

* commit '367e1af28754dd952a8da6f262c41dc5004c2366':
  Remove android.syncml package completely.
2009-10-01 12:14:07 -07:00
Zhu Lan
e7b2d93f22 am ba61cff4: am e5661c40: Merge change I8366852f into eclair
Merge commit 'ba61cff482a048131937d82f0d9652c799383314'

* commit 'ba61cff482a048131937d82f0d9652c799383314':
  Bluetooth A2DP suspend/resume functionality
2009-10-01 12:13:57 -07:00
Mike Cleron
5679ccb9b5 am 051b28dd: am 170d9df0: Merge change I2d4deb11 into eclair
Merge commit '051b28dd658ffff709db17ee70a563d18e103ec8'

* commit '051b28dd658ffff709db17ee70a563d18e103ec8':
  Placeholder mdpi assets
2009-10-01 12:12:43 -07:00
Daisuke Miyakawa
825af8cb2c am ee1a41d0: am 85d86af9: Merge change I82be558f into eclair
Merge commit 'ee1a41d00adab64cd426d13d72551f28077adaff'

* commit 'ee1a41d00adab64cd426d13d72551f28077adaff':
  Fix vCard composer in three points.
2009-10-01 12:12:34 -07:00
Fred Quintana
c8735f183a am 32a702a7: am 609c2c08: Merge change Ia54b1bf0 into eclair
Merge commit '32a702a7a8a328a7080c18fd65478caf82d86e0e'

* commit '32a702a7a8a328a7080c18fd65478caf82d86e0e':
  - make SyncManager get the accounts list during the constructor,
2009-10-01 12:12:25 -07:00
Jaikumar Ganesh
5ffad23e91 am 8d984bc9: am 017c5de1: Merge change I78c4e64a into eclair
Merge commit '8d984bc9c351e18271213c58ae7baea5cc81fda6'

* commit '8d984bc9c351e18271213c58ae7baea5cc81fda6':
  Query from Bluez if name is not present in cache.
2009-10-01 12:11:18 -07:00
Dave Sparks
2d14045754 am 08e2f9d1: am 8b781403: Merge change Id0ac8c08 into eclair
Merge commit '08e2f9d1c784b3b5c7fcd11317bde6646be25896'

* commit '08e2f9d1c784b3b5c7fcd11317bde6646be25896':
  Reduce the log spew from AudioFlinger due to a certain device that can't meet latency timing. Bug 2142215.
2009-10-01 12:10:42 -07:00
Android Git Automerger
6eb1d79db5 merge 54e7073f, ignoring preloaded-classes 2009-10-01 12:07:15 -07:00
Robert Greenwalt
4028c0a8e3 am 515052fe: am a3431e4c: Merge change I84612ea6 into eclair
Merge commit '515052fe87eacbf3ce864077657297ef548f1716'

* commit '515052fe87eacbf3ce864077657297ef548f1716':
  Add a delay to wifi driver stop on screen off.
2009-10-01 11:58:31 -07:00
Andrei Popescu
ace8382a05 am d01d77f5: am 6e58cf21: Merge change I020d2e34 into eclair
Merge commit 'd01d77f5cc9ac037c5bc9c5b05f1decfec0abbe2'

* commit 'd01d77f5cc9ac037c5bc9c5b05f1decfec0abbe2':
  Invoke the OnErrorListener callback when MediaPlayer.setDataSource() throws.
2009-10-01 11:58:17 -07:00
Bryan Mawhinney
94b9befdf9 am 973c0998: am fb54aadd: Merge change Ic3aa7aa6 into eclair
Merge commit '973c0998b243a2fbfc1419238d50726c67c12cfb'

* commit '973c0998b243a2fbfc1419238d50726c67c12cfb':
  Recreate search dialog view each time it's shown.
2009-10-01 11:56:56 -07:00
Cary Clark
4c49cfb0dd am 8fbd4a7a: am 0c5924e9: preserve webkit-side text selection
Merge commit '8fbd4a7a6bb9dd68d39fff6c3b1fd91303765fc4'

* commit '8fbd4a7a6bb9dd68d39fff6c3b1fd91303765fc4':
  preserve webkit-side text selection
2009-10-01 11:56:46 -07:00
Jack Palevich
8bc82c7ff3 am bb815129: am b386a86c: Merge change I8018f091 into eclair
Merge commit 'bb8151294c020f52cda84d006ba55d9baa069229'

* commit 'bb8151294c020f52cda84d006ba55d9baa069229':
  Add very simple input path. Fix end-of-line issues.
2009-10-01 11:56:07 -07:00
Mike Reed
a5ad2c2311 am 0084c1cd: am 9fcd581a: Merge change I4e03999c into eclair
Merge commit '0084c1cdc26338b779df2978bb8300df5424f29a'

* commit '0084c1cdc26338b779df2978bb8300df5424f29a':
  if we have a single value for roundrect radius, manually clamp it before drawing.
2009-10-01 11:55:54 -07:00
Hung-ying Tyan
f54f9be750 am 4c0d406d: am 2df1cc43: Merge change I42a80783 into eclair
Merge commit '4c0d406d56894037df7669064e1d67b4f51cdb6d'

* commit '4c0d406d56894037df7669064e1d67b4f51cdb6d':
  Remove deprecated VpnType.getDescription().
2009-10-01 11:55:44 -07:00
Leon Clarke
1b46ea41d3 am 2f208646: am ccf6947e: Merge change Ib89f80df into eclair
Merge commit '2f208646ebe7579c2b8694c66d55f8c883df0ec3'

* commit '2f208646ebe7579c2b8694c66d55f8c883df0ec3':
  Re-instate the link coloring on startup, but going via the browser
2009-10-01 11:55:25 -07:00
Jim Miller
1959d9321f am 2c799f05: am badfac38: Merge change I85d63002 into eclair
Merge commit '2c799f0534215e76ad2cd0fd4a513bd9f1fa0252'

* commit '2c799f0534215e76ad2cd0fd4a513bd9f1fa0252':
  Fix for 2139014: Allow platform customization of vibration pattern in LockScreenView.
2009-10-01 11:55:15 -07:00
Hung-ying Tyan
3222f7a3a0 am c7c6bbac: am f2bd9017: make vpn type strings i18n ready.
Merge commit 'c7c6bbacb84bcd8f485758ce2031ec320e179b40'

* commit 'c7c6bbacb84bcd8f485758ce2031ec320e179b40':
  make vpn type strings i18n ready.
2009-10-01 11:54:58 -07:00
Mike Cleron
7b81fe7773 am 11d8d62e: am 4ca8c837: Merge change Ia4087911 into eclair
Merge commit '11d8d62e740ea171b19ed32306f3db2973a5242a'

* commit '11d8d62e740ea171b19ed32306f3db2973a5242a':
  Newer icons
2009-10-01 11:54:20 -07:00
Ray Chen
4fe9804aa7 am dc8afacc: am 3ba35126: update current.xml for cancelThumbnailRequest api.
Merge commit 'dc8afacc5b927a151f6a9f9f3d44b5fec590c920'

* commit 'dc8afacc5b927a151f6a9f9f3d44b5fec590c920':
  update current.xml for cancelThumbnailRequest api.
2009-10-01 11:52:50 -07:00
Ray Chen
ede7a8220e am 5a92f5dc: am 49e750a3: Merge change I7495977a into eclair
Merge commit '5a92f5dc80ae74ad859b86c6d18d8ad42cc799a3'

* commit '5a92f5dc80ae74ad859b86c6d18d8ad42cc799a3':
  Add cancelThumbnailRequest to thumbnail API.
2009-10-01 11:52:39 -07:00
Jianhong Jiang
0cdb0e7637 am 722eba00: am 37b0f279: Merge change I999f1aeb into eclair
Merge commit '722eba008c20d545ff8f17584cda282ab2800e29'

* commit '722eba008c20d545ff8f17584cda282ab2800e29':
  Remove audio latency fudge factor 96 msec.
2009-10-01 11:51:54 -07:00
Nicolas Catania
eca6197244 am f8c92a0f: am fd974f20: Merge change Ifb2ab8f8 into eclair
Merge commit 'f8c92a0f00e38271755a93ff810fee94e8353bfd'

* commit 'f8c92a0f00e38271755a93ff810fee94e8353bfd':
  Reverting the background colors back to cupcake's values.
2009-10-01 11:51:44 -07:00
Costin Manolache
d153ea28e0 am 264f9b45: am 3348f14b: Remove GAIA string
Merge commit '264f9b4530d6ecbd9e9d02cf5c61c7b19f4c6376'

* commit '264f9b4530d6ecbd9e9d02cf5c61c7b19f4c6376':
  Remove GAIA string
2009-10-01 11:51:16 -07:00
Mike Cleron
a8b2d463b8 am 90183823: am b4ee8349: Merge change I290947bb into eclair
Merge commit '90183823b00ad5ce04948cf03d827a47c82ca445'

* commit '90183823b00ad5ce04948cf03d827a47c82ca445':
  Git sucks
2009-10-01 11:50:07 -07:00
Yu Shan Emily Lau
f2496dc8b9 am f1fa1eac: am edd942c2: Merge change I55a6ac8c into eclair
Merge commit 'f1fa1eacaa36c80c2094ba679b8384d9f4541e11'

* commit 'f1fa1eacaa36c80c2094ba679b8384d9f4541e11':
  Fixed the long recorder time and reduce the number of loops.
2009-10-01 11:49:46 -07:00
Debajit Ghosh
2117e2056e am ebefded1: am 2a35c8d7: Merge change I96cb8d0b into eclair
Merge commit 'ebefded1ccbd13f190aa4c5f4e3590e5ac8f2a6d'

* commit 'ebefded1ccbd13f190aa4c5f4e3590e5ac8f2a6d':
  fix account permission strings.  this permission is used to protect more than just Google accounts.
2009-10-01 11:49:34 -07:00
Dan Egnor
c2c055586e am 5495ee0c: am b1b289a0: Merge change Id6688603 into eclair
Merge commit '5495ee0c09661b44ecec095e111b9564e356e272'

* commit '5495ee0c09661b44ecec095e111b9564e356e272':
  Better event log tracking for initializeDevice() requests --
2009-10-01 11:48:22 -07:00
Mike LeBeau
7b86961d45 am 6cf9ab65: am 2e4dbe70: Unhide APIs for enabling geolocation in web views. I\'ve confirmed with Grace that these are okay to unhide.
Merge commit '6cf9ab65888265aa87139694ed94ba0830b54707'

* commit '6cf9ab65888265aa87139694ed94ba0830b54707':
  Unhide APIs for enabling geolocation in web views. I've confirmed
2009-10-01 11:47:43 -07:00
Jim Miller
a48fb8aa68 am 11cc925e: am a4c96aa2: Merge change I88bb16e6 into eclair
Merge commit '11cc925efbe582d617ffd01894f920f9a675adc3'

* commit '11cc925efbe582d617ffd01894f920f9a675adc3':
  Fix for 2133391: Allow menu hard key to be disabled in LockScreen on some devices
2009-10-01 11:46:25 -07:00
Xavier Ducrohet
cc8f6eafc3 am 8167d8d8: am dd49055a: am ac18e4f2: Update 4.xml with the native status change of breakText/measureText
Merge commit '8167d8d874289c8adf5fbad1ff0790173d7616c1'

* commit '8167d8d874289c8adf5fbad1ff0790173d7616c1':
  Update 4.xml with the native status change of breakText/measureText
2009-10-01 11:46:14 -07:00
Dianne Hackborn
d4a4462f55 am 844d6f9e: (-s ours) am 989384b2: am e67f0c97: (-s ours) Hack to fix issue #2125365: Sports Trivia compatability with Eclair (do not merge)
Merge commit '844d6f9ef0aec65df51ab3f3a9960e2611783722'

* commit '844d6f9ef0aec65df51ab3f3a9960e2611783722':
  Hack to fix issue #2125365: Sports Trivia compatability with Eclair (do not merge)
2009-10-01 11:46:05 -07:00