Commit Graph

4540 Commits

Author SHA1 Message Date
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
Android (Google) Code Review
5c5844b313 Merge change 23906 into eclair
* changes:
  Removing references to deprecated API and the deprecated API itself.
2009-09-03 16:29:44 -07:00
Andreas Huber
b7043e6c32 am a19cb68b: Merge change 23908 into eclair
Merge commit 'a19cb68b2d010718467564733e6eaef2aaf4d0b8' into eclair-plus-aosp

* commit 'a19cb68b2d010718467564733e6eaef2aaf4d0b8':
  Add another testcase for moto to reproduce bug #2099685 to the stagefright commandline app.
2009-09-03 16:25:48 -07:00
Android (Google) Code Review
8e7e2b80df Merge change 23908 into eclair
* changes:
  Add another testcase for moto to reproduce bug #2099685 to the stagefright commandline app.
2009-09-03 16:24:46 -07:00
Wink Saville
6b067efbfd am ccc41a26: Merge change 23870 into eclair
Merge commit 'ccc41a26b8e1d702c1ccec1642758bde52e1b435' into eclair-plus-aosp

* commit 'ccc41a26b8e1d702c1ccec1642758bde52e1b435':
  Allow hasIccCard to be useable by any processes.
2009-09-03 15:56:10 -07:00
Android (Google) Code Review
44946b9f87 Merge change 23870 into eclair
* changes:
  Allow hasIccCard to be useable by any processes.
2009-09-03 15:54:22 -07:00
Jason Sams
045598fe2e am 4879d0d0: Merge change 23890 into eclair
Merge commit '4879d0d0a41c8f082facd6172221d0c36f21c6c2' into eclair-plus-aosp

* commit '4879d0d0a41c8f082facd6172221d0c36f21c6c2':
  Improve structure support using symbol lookup of named structures in scripts to allow them to appear as just pointers to structs.
2009-09-03 15:50:02 -07:00
Android (Google) Code Review
4f01710579 Merge change 23890 into eclair
* changes:
  Improve structure support using symbol lookup of named structures in scripts to allow them to appear as just pointers to structs.
2009-09-03 15:47:39 -07:00
Jean-Baptiste Queru
00e0d6c286 merge from donut 2009-09-03 15:19:21 -07:00
Jaikumar Ganesh
dea739f6bb am 7c599e02: Merge change 21774 into eclair
Merge commit '7c599e0288fb4ad9d393467458f59c45638d04ec' into eclair-plus-aosp

* commit '7c599e0288fb4ad9d393467458f59c45638d04ec':
  Implement USIM and add support for importing emails from USIM.
2009-09-03 14:46:03 -07:00
Android (Google) Code Review
2483a0c05a Merge change 21774 into eclair
* changes:
  Implement USIM and add support for importing emails from USIM.
2009-09-03 14:45:00 -07:00
Dianne Hackborn
e08b3cbef2 am ebf0bbaa: Merge change 23868 into eclair
Merge commit 'ebf0bbaaf03269eda9831e3c6b5ff82010b1de57' into eclair-plus-aosp

* commit 'ebf0bbaaf03269eda9831e3c6b5ff82010b1de57':
  Add better service reporting.
2009-09-03 14:37:37 -07:00
Mike Lockwood
003b7fc6fd am e131b746: Merge change 23861 into eclair
Merge commit 'e131b7466c8b817896a618efe4b34eed5d3e51f9' into eclair-plus-aosp

* commit 'e131b7466c8b817896a618efe4b34eed5d3e51f9':
  Replace the bugreport symlink with a tool that starts the new dumpstate service.
2009-09-03 14:37:33 -07:00
Android (Google) Code Review
62b7aaccae Merge change 23868 into eclair
* changes:
  Add better service reporting.
2009-09-03 14:36:28 -07:00
Android (Google) Code Review
a9455c8539 Merge change 23861 into eclair
* changes:
  Replace the bugreport symlink with a tool that starts the new dumpstate service.
2009-09-03 14:18:51 -07:00
Cynthia Wong
a7896d2330 am 7a260ba9: Merge change 23824 into eclair
Merge commit '7a260ba96869ddae47afe773d3dae7a6a8c2b9c3' into eclair-plus-aosp

* commit '7a260ba96869ddae47afe773d3dae7a6a8c2b9c3':
  Override getAccounts to return an empty AccountSet in MockAccountManager. This used to throw an NPE instead since IAccountManagerService is set to NULL.
2009-09-03 14:18:25 -07:00
Android (Google) Code Review
14c76030e3 Merge change 23824 into eclair
* changes:
  Override getAccounts to return an empty AccountSet in MockAccountManager. This used to throw an NPE instead since IAccountManagerService is set to NULL.
2009-09-03 14:16:57 -07:00
Xia Wang
475539f8ff am 19d6f7ac: Merge change 23750 into eclair
Merge commit '19d6f7ac27448b59c936878756bad49f623a6a99' into eclair-plus-aosp

* commit '19d6f7ac27448b59c936878756bad49f623a6a99':
  Add a test case to measure the power usage of loading a web page
2009-09-03 13:37:05 -07:00
Android (Google) Code Review
a51b3100c1 Merge change 23750 into eclair
* changes:
  Add a test case to measure the power usage of loading a web page
2009-09-03 13:34:58 -07:00
Robert Greenwalt
87869ab6a2 am 1c1ffa0c: Promote MccTable to telephony and use it for both gsm/cdma
Merge commit '1c1ffa0cab8b56274970736d7f3b8c00c01c3d2b' into eclair-plus-aosp

* commit '1c1ffa0cab8b56274970736d7f3b8c00c01c3d2b':
  Promote MccTable to telephony and use it for both gsm/cdma
2009-09-03 13:05:00 -07:00
Marco Nelissen
2e942021f4 am e1da8be5: Merge change 23835 into eclair
Merge commit 'e1da8be501e953cdf50b0ba2edf8fe68af8cf2b9' into eclair-plus-aosp

* commit 'e1da8be501e953cdf50b0ba2edf8fe68af8cf2b9':
  When encountering a .nomedia file, notify the MediaScannerClient,
2009-09-03 12:29:51 -07:00
Android (Google) Code Review
732e8824bc Merge change 23835 into eclair
* changes:
  When encountering a .nomedia file, notify the MediaScannerClient, so that it can erase the data column for entries that are in the folder containing the .nomedia file. This prevents us from deleting (via a delete trigger) files when somebody adds a .nomedia file after the fact.
2009-09-03 12:27:26 -07:00
Leon Scroggins
3325477e8f am b00fc735: Merge change 23760 into eclair
Merge commit 'b00fc7357f50ba0ebc1a5e48be2a1ee096bf1b67' into eclair-plus-aosp

* commit 'b00fc7357f50ba0ebc1a5e48be2a1ee096bf1b67':
  Attach the title bar to the top of the page.
2009-09-03 11:44:43 -07:00