Commit Graph

4712 Commits

Author SHA1 Message Date
Android (Google) Code Review
20ef5001d7 Merge change 24060 into eclair
* changes:
  Integrated the profiler into the framework. We run it all the time if the persist.sampling_profiler system property is set. Saves snapshots to the SD card.
2009-09-06 16:41:35 -07:00
San Mehat
19a6c4f781 am a4eb91da: dumpstate: Add the ctime (time the file was harvested out of /proc) to dump.
Merge commit 'a4eb91da03bd785bc91bed0d25a9efaa9baba1c1' into eclair-plus-aosp

* commit 'a4eb91da03bd785bc91bed0d25a9efaa9baba1c1':
  dumpstate: Add the ctime (time the file was harvested out of /proc) to dump.
2009-09-05 15:33:10 -07:00
Ye Wen
8c9127c034 am 0b98c944: Fix code placement and comments for gtalk url scraping settings.
Merge commit '0b98c944c6bac98d95c93916cde31f841b44d9aa' into eclair-plus-aosp

* commit '0b98c944c6bac98d95c93916cde31f841b44d9aa':
  Fix code placement and comments for gtalk url scraping settings.
2009-09-05 08:35:51 -07:00
Ye Wen
cb345d4fcb am 98187192: Merge change 24014 into eclair
Merge commit '981871922ded799f51b7b8a3e53028d70f37e65c' into eclair-plus-aosp

* commit '981871922ded799f51b7b8a3e53028d70f37e65c':
  Gservices settings for controlling URL scraping in GTalk app.
2009-09-04 22:52:58 -07:00
Android (Google) Code Review
f0780974fc Merge change 24014 into eclair
* changes:
  Gservices settings for controlling URL scraping in GTalk app.
2009-09-04 22:50:49 -07:00
Mathias Agopian
4b1e086d1c am ffae4fcc: attempt to fix [2099362] Possible SurfaceFlinger crash
Merge commit 'ffae4fcc78d0f280da6052d102b11962fb8041b7' into eclair-plus-aosp

* commit 'ffae4fcc78d0f280da6052d102b11962fb8041b7':
  attempt to fix [2099362] Possible SurfaceFlinger crash
2009-09-04 19:52:50 -07:00
Mathias Agopian
0852e67412 attempt to fix [2099362] Possible SurfaceFlinger crash 2009-09-04 19:50:23 -07:00
Dmitri Plotnikov
913f1e8367 am 9cc1817d: Merge change 24039 into eclair
Merge commit '9cc1817d46d8092865d8f1e7a6391dcae197a26a' into eclair-plus-aosp

* commit '9cc1817d46d8092865d8f1e7a6391dcae197a26a':
  Fixing a concurrency problem by changing the contact aggregation exception API.
2009-09-04 18:33:07 -07:00
Android (Google) Code Review
89b9bd4655 Merge change 24039 into eclair
* changes:
  Fixing a concurrency problem by changing the contact aggregation exception API.
2009-09-04 18:30:46 -07:00
Jason Sams
323c1d1150 am ac67ebe6: Merge change 24058 into eclair
Merge commit 'ac67ebe667d30f3cd2e39fa57164d4f3ddaea677' into eclair-plus-aosp

* commit 'ac67ebe667d30f3cd2e39fa57164d4f3ddaea677':
  Minor perf improvement to fall and expand use of struct.
2009-09-04 18:22:45 -07:00
Jason Sams
ffd7b997b2 am a3c745da: Merge change 24057 into eclair
Merge commit 'a3c745dafa2679b73a6d499324b6ffaac819fdc9' into eclair-plus-aosp

* commit 'a3c745dafa2679b73a6d499324b6ffaac819fdc9':
  checkpoint
2009-09-04 18:22:42 -07:00
Android (Google) Code Review
bb7785e8b9 Merge change 24058 into eclair
* changes:
  Minor perf improvement to fall and expand use of struct.
2009-09-04 18:21:30 -07:00
Android (Google) Code Review
2e7dc1229a Merge change 24057 into eclair
* changes:
  checkpoint
2009-09-04 18:21:18 -07:00
Mathias Agopian
0d2428e6db am 3194a663: Merge change 24048 into eclair
Merge commit '3194a66329ea617c1f7bf558e2ac6a765860dd97' into eclair-plus-aosp

* commit '3194a66329ea617c1f7bf558e2ac6a765860dd97':
  fix [2098939] Smooth gradients show banding on Sholes
2009-09-04 18:18:21 -07:00
Android (Google) Code Review
1ca4292a2d Merge change 24048 into eclair
* changes:
  fix [2098939] Smooth gradients show banding on Sholes
2009-09-04 18:17:15 -07:00
Romain Guy
730c4ef780 am 2d496bfe: Fix point sprites.
Merge commit '2d496bfebc010f26d65dd5e3a3c4a8170919cf0a' into eclair-plus-aosp

* commit '2d496bfebc010f26d65dd5e3a3c4a8170919cf0a':
  Fix point sprites.
2009-09-04 17:58:57 -07:00
Mathias Agopian
888eee68db fix [2098939] Smooth gradients show banding on Sholes 2009-09-04 17:27:16 -07:00
Dirk Dougherty
fac86e0ac9 am e51ddc1b: am dac0d75a: Doc change only: Add sizes/checksums for SDK packages.
Merge commit 'e51ddc1b688fc6ecd57a1aa5cfdebbe1c22fc24d' into eclair-plus-aosp

* commit 'e51ddc1b688fc6ecd57a1aa5cfdebbe1c22fc24d':
  Doc change only: Add sizes/checksums for SDK packages.
2009-09-04 16:48:13 -07:00
Dirk Dougherty
556d47426c am dac0d75a: Doc change only: Add sizes/checksums for SDK packages.
Merge commit 'dac0d75ad7fbd10981477b1fcc35c955185a41fd' into eclair

* commit 'dac0d75ad7fbd10981477b1fcc35c955185a41fd':
  Doc change only: Add sizes/checksums for SDK packages.
2009-09-04 16:45:52 -07:00
Robert Greenwalt
15e6e850f8 am c2042f5e: Merge change 24029 into eclair
Merge commit 'c2042f5e4910c4f7c5b812787ad2b025d93da497' into eclair-plus-aosp

* commit 'c2042f5e4910c4f7c5b812787ad2b025d93da497':
  Fix mncLength in cases with a malformed AD_DONE msg from SIM
2009-09-04 16:00:08 -07:00
Android (Google) Code Review
348a950aa2 Merge change 24029 into eclair
* changes:
  Fix mncLength in cases with a malformed AD_DONE msg from SIM
2009-09-04 15:58:02 -07:00
Dianne Hackborn
90c5d88f62 am 6e4b7d66: Merge change 24020 into eclair
Merge commit '6e4b7d66998b9ec9255767f6070a2f94d83944a5' into eclair-plus-aosp

* commit '6e4b7d66998b9ec9255767f6070a2f94d83944a5':
  Wallpapers: new transitions, hiding when not visible, other cleanup.
2009-09-04 15:42:59 -07:00
Jason Sams
231c35bc9e am da214787: Merge change 24024 into eclair
Merge commit 'da214787988ab6bf3c54d96072300723a72b9e3b' into eclair-plus-aosp

* commit 'da214787988ab6bf3c54d96072300723a72b9e3b':
  Remove "predefined" elements from Java layer.  Static elements continue to exist but are no longer treated as a special version of element.
2009-09-04 15:42:56 -07:00
Android (Google) Code Review
87c1b80a5a Merge change 24020 into eclair
* changes:
  Wallpapers: new transitions, hiding when not visible, other cleanup.
2009-09-04 15:40:30 -07:00
Android (Google) Code Review
d785d0b6df Merge change 24024 into eclair
* changes:
  Remove "predefined" elements from Java layer.  Static elements continue to exist but are no longer treated as a special version of element.
2009-09-04 15:39:46 -07:00
Costin Manolache
45f5ae8ff5 am ff86d9f9: Merge change 24002 into eclair
Merge commit 'ff86d9f9dc30d2eebe56af27c8cdb0bcd4227bf4' into eclair-plus-aosp

* commit 'ff86d9f9dc30d2eebe56af27c8cdb0bcd4227bf4':
  Fix SparseArray accesses
2009-09-04 15:18:50 -07:00
Android (Google) Code Review
04b7fdcb68 Merge change 24002 into eclair
* changes:
  Fix SparseArray accesses
2009-09-04 15:16:25 -07:00
Leon Scroggins
ce79ffc26d am 608f9f47: When zooming, do not draw the WebTextView. Resize it when done.
Merge commit '608f9f470fa562fc6a32449297110d4ec2953515' into eclair-plus-aosp

* commit '608f9f470fa562fc6a32449297110d4ec2953515':
  When zooming, do not draw the WebTextView.  Resize it when done.
2009-09-04 15:09:28 -07:00
Leon Scroggins
408f4eb7d2 am 3c32474f: Merge change 24008 into eclair
Merge commit '3c32474f0e0df419135f1966796d277aba9ee7cb' into eclair-plus-aosp

* commit '3c32474f0e0df419135f1966796d277aba9ee7cb':
  Clean up from earlier changes to place title bar at top of WebView
2009-09-04 14:40:42 -07:00
Android (Google) Code Review
5cc24712cb Merge change 24008 into eclair
* changes:
  Clean up from earlier changes to place title bar at top of WebView
2009-09-04 14:38:20 -07:00
Ken Shirriff
039c627b21 am 0e3cd546: Merge change 23907 into eclair
Merge commit '0e3cd546001cb82b8d9c8e910cf751d1d2a584df' into eclair-plus-aosp

* commit '0e3cd546001cb82b8d9c8e910cf751d1d2a584df':
  Add sync_details support.
2009-09-04 14:32:16 -07:00
Android (Google) Code Review
53691ae359 Merge change 23907 into eclair
* changes:
  Add sync_details support.
2009-09-04 14:30:29 -07:00
Karl Rosaen
e85b4494ce am 107039f9: Merge change 24010 into eclair
Merge commit '107039f94888fce212e0965b74971727d2b01b82' into eclair-plus-aosp

* commit '107039f94888fce212e0965b74971727d2b01b82':
  Don't toggle between in app and global search on repeat key events.
2009-09-04 14:25:30 -07:00
Android (Google) Code Review
6c3a35290b Merge change 24010 into eclair
* changes:
  Don't toggle between in app and global search on repeat key events.
2009-09-04 14:24:00 -07:00
Grace Kloba
7b54d00c6e am 3c72fff0: Some mobile sites, like m.www.yahoo.com, slashdot.org (iPhone version), have a bigger minPrefWidth than the screen width. So we don\'t want to force the minZoomScale to be same as defaultScale. Otherwise we won\'t be able to zoom out in these sites.
Merge commit '3c72fff035e287f9e0b9340cc3921896ca86380b' into eclair-plus-aosp

* commit '3c72fff035e287f9e0b9340cc3921896ca86380b':
  Some mobile sites, like m.www.yahoo.com, slashdot.org (iPhone version),
2009-09-04 13:32:50 -07:00
Karl Rosaen
937de7bcf9 am 93a751d6: Merge change 23979 into eclair
Merge commit '93a751d6adc00cbc6fb564b27592fc5730a655ef' into eclair-plus-aosp

* commit '93a751d6adc00cbc6fb564b27592fc5730a655ef':
  Do a better job at finding the activity associated with a dialog when triggering search.
2009-09-04 13:07:57 -07:00
Android (Google) Code Review
8173034c0b Merge change 23979 into eclair
* changes:
  Do a better job at finding the activity associated with a dialog when triggering search.
2009-09-04 13:05:50 -07:00
Chih-Chung Chang
037bc28229 am 1e52988a: Merge change 23940 into eclair
Merge commit '1e52988adc9e7b6136374d01e7537d756ac89f82' into eclair-plus-aosp

* commit '1e52988adc9e7b6136374d01e7537d756ac89f82':
  Add more documents on the ACTION_SEND_MULTIPLE intent.
2009-09-04 12:53:14 -07:00
Android (Google) Code Review
691d09dd8e Merge change 23940 into eclair
* changes:
  Add more documents on the ACTION_SEND_MULTIPLE intent.
2009-09-04 12:51:11 -07:00
Mike Reed
6d158676ae am e8853fc5: also expose onDrawHorizontalScrollBar() in View retool WebView\'s calculations to correctly compute scrollbar height and parameters
Merge commit 'e8853fc57093e781fa7c659c6eb4da3be9f8695a' into eclair-plus-aosp

* commit 'e8853fc57093e781fa7c659c6eb4da3be9f8695a':
  also expose onDrawHorizontalScrollBar() in View
2009-09-04 12:24:51 -07:00
Grace Kloba
03e304b6d3 am e5b6d02f: Translate the content dimension to the view space before setting them to the view.
Merge commit 'e5b6d02f34af2cd81615653b00c96a421d5ea819' into eclair-plus-aosp

* commit 'e5b6d02f34af2cd81615653b00c96a421d5ea819':
  Translate the content dimension to the view space before setting them to the view.
2009-09-04 10:38:40 -07:00
Mike Lockwood
463e080468 am 445f4308: NotificationManagerService: Only blink red battery low LED when not charging.
Merge commit '445f43081e207ee704a5152a5333054d7b4e13a4' into eclair-plus-aosp

* commit '445f43081e207ee704a5152a5333054d7b4e13a4':
  NotificationManagerService: Only blink red battery low LED when not charging.
2009-09-04 10:05:48 -07:00
Jean-Baptiste Queru
baa0a83669 merge from open-source master 2009-09-04 07:54:30 -07:00
Eddie Ho
1208801d1b am 71119048: Merge change 23949 into eclair
Merge commit '7111904802934e1fa4cf68c445f13c34c30c9cdb' into eclair-plus-aosp

* commit '7111904802934e1fa4cf68c445f13c34c30c9cdb':
  GPS: Fix race condition reporting NMEA data.
2009-09-04 04:50:59 -07:00
Android (Google) Code Review
b3668975ab Merge change 23949 into eclair
* changes:
  GPS: Fix race condition reporting NMEA data.
2009-09-04 04:49:11 -07:00
Andrei Popescu
1a57fba26f am 34619494: Merge change 23804 into eclair
Merge commit '34619494e009d998f5c073145c0481e38bbd2bcf' into eclair-plus-aosp

* commit '34619494e009d998f5c073145c0481e38bbd2bcf':
  Fix appcache layout test that was timing out due to race condition in WebView::addJavascriptInterface.
2009-09-04 03:29:36 -07:00
Android (Google) Code Review
c395c346c5 Merge change 23804 into eclair
* changes:
  Fix appcache layout test that was timing out due to race condition in WebView::addJavascriptInterface.
2009-09-04 03:27:47 -07:00
Jesse Wilson
cc16c8de84 am f163f7f0: do not merge: fix API current.xml for Hashtable.
Merge commit 'f163f7f0f29f0898eb82f54cf657cb34668abade' into eclair-plus-aosp

* commit 'f163f7f0f29f0898eb82f54cf657cb34668abade':
  do not merge: fix API current.xml for Hashtable.
2009-09-03 18:23:40 -07:00
Jesse Wilson
411b27a924 am 6de753bf: do not merge: update API for Josh\'s optimizations for Eclair
Merge commit '6de753bffe47e796942272692869992f62f8f0ab' into eclair-plus-aosp

* commit '6de753bffe47e796942272692869992f62f8f0ab':
  do not merge: update API for Josh's optimizations for Eclair
2009-09-03 17:50:58 -07:00
Dmitri Plotnikov
f6f4763092 am 1ab3ebad: Merge change 23906 into eclair
Merge commit '1ab3ebad95e6b537719ee2f608c1fbc321e51f06' into eclair-plus-aosp

* commit '1ab3ebad95e6b537719ee2f608c1fbc321e51f06':
  Removing references to deprecated API and the deprecated API itself.
2009-09-03 16:31:26 -07:00