8228 Commits

Author SHA1 Message Date
Grace Kloba
3c72fff035 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.

Fix http://b/issue?id=2090718
2009-09-04 13:29:20 -07:00
Karl Rosaen
6b770514a3 am 81c7192d: am 93a751d6: Merge change 23979 into eclair
Merge commit '81c7192d335b7260914105578006ef662c3d641a'

* commit '81c7192d335b7260914105578006ef662c3d641a':
  Do a better job at finding the activity associated with a dialog when triggering search.
2009-09-04 13:09:43 -07:00
Karl Rosaen
81c7192d33 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
93a751d6ad 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
2353fcf159 am 71e0da0f: am 1e52988a: Merge change 23940 into eclair
Merge commit '71e0da0f238270254bb0e7cea3e3506cb5cfdb18'

* commit '71e0da0f238270254bb0e7cea3e3506cb5cfdb18':
  Add more documents on the ACTION_SEND_MULTIPLE intent.
2009-09-04 12:55:02 -07:00
Chih-Chung Chang
71e0da0f23 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
1e52988adc 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
6a75aefda5 am a9efeb48: am e8853fc5: also expose onDrawHorizontalScrollBar() in View retool WebView\'s calculations to correctly compute scrollbar height and parameters
Merge commit 'a9efeb48ea6e74be217f27fb1373d7c2a3eb748b'

* commit 'a9efeb48ea6e74be217f27fb1373d7c2a3eb748b':
  also expose onDrawHorizontalScrollBar() in View
2009-09-04 12:26:31 -07:00
Mike Reed
a9efeb48ea 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
Android (Google) Code Review
1ce66722ec Merge change 23978
* changes:
  Log.d -> Log.v
2009-09-04 12:19:36 -07:00
Mike Reed
e8853fc570 also expose onDrawHorizontalScrollBar() in View
retool WebView's calculations to correctly compute scrollbar height and parameters
2009-09-04 15:05:27 -04:00
Karl Rosaen
7bafed8623 Do a better job at finding the activity associated with a dialog when triggering search.
It first looks to see if there is an activity that is managing the dialog, and if not,
follows the context / contextwrapper chain to find an activity if possible.

Fixes http://b/issue?id=2064772.
2009-09-04 11:27:05 -07:00
Andy McFadden
98d493588f Log.d -> Log.v
Don't need "Got feature list request" from ddm-heap.
2009-09-04 11:16:50 -07:00
Grace Kloba
b16b2516a7 am 3d031d2a: am e5b6d02f: Translate the content dimension to the view space before setting them to the view.
Merge commit '3d031d2a19900474501650d555628fa3baf2b314'

* commit '3d031d2a19900474501650d555628fa3baf2b314':
  Translate the content dimension to the view space before setting them to the view.
2009-09-04 11:07:21 -07:00
Mike Lockwood
55c67f4262 am 267e6214: am 445f4308: NotificationManagerService: Only blink red battery low LED when not charging.
Merge commit '267e621468516e4e5da82707f8a2d84ada164131'

* commit '267e621468516e4e5da82707f8a2d84ada164131':
  NotificationManagerService: Only blink red battery low LED when not charging.
2009-09-04 11:07:12 -07:00
Jean-Baptiste Queru
6179d2f928 am 3c193a4a: merge from open-source master
Merge commit '3c193a4a8d748faf420988250aabda0145e74bf7'

* commit '3c193a4a8d748faf420988250aabda0145e74bf7':
  Fix %p vs %s typo in aapt message
2009-09-04 11:06:31 -07:00
Eddie Ho
d7078c586b am 8e739ac6: am 71119048: Merge change 23949 into eclair
Merge commit '8e739ac69fbfc36a138800e7b0a2caf88b11a181'

* commit '8e739ac69fbfc36a138800e7b0a2caf88b11a181':
  GPS: Fix race condition reporting NMEA data.
2009-09-04 11:05:19 -07:00
Andrei Popescu
3672f246a8 am 13e3e0ab: am 34619494: Merge change 23804 into eclair
Merge commit '13e3e0ab9a40d6130e4dc1102bba920a1f5c3c2b'

* commit '13e3e0ab9a40d6130e4dc1102bba920a1f5c3c2b':
  Fix appcache layout test that was timing out due to race condition in WebView::addJavascriptInterface.
2009-09-04 11:05:10 -07:00
Jesse Wilson
29459b22a0 am 1cdacef0: (-s ours) am f163f7f0: do not merge: fix API current.xml for Hashtable.
Merge commit '1cdacef021bdea80fcb40c72dd8efa7fe718debe'

* commit '1cdacef021bdea80fcb40c72dd8efa7fe718debe':
  do not merge: fix API current.xml for Hashtable.
2009-09-04 11:04:54 -07:00
Jesse Wilson
6925ef384d am 6ffca353: (-s ours) am 6de753bf: do not merge: update API for Josh\'s optimizations for Eclair
Merge commit '6ffca3534c7b12bf503529bf50b53cfc6c728ff7'

* commit '6ffca3534c7b12bf503529bf50b53cfc6c728ff7':
  do not merge: update API for Josh's optimizations for Eclair
2009-09-04 11:04:49 -07:00
Dmitri Plotnikov
328b963fd9 am da32be5e: am 1ab3ebad: Merge change 23906 into eclair
Merge commit 'da32be5e06b9f02d0113b072de79276e16d19f50'

* commit 'da32be5e06b9f02d0113b072de79276e16d19f50':
  Removing references to deprecated API and the deprecated API itself.
2009-09-04 11:04:21 -07:00
Andreas Huber
7f3efff773 am 0e5e77ce: am a19cb68b: Merge change 23908 into eclair
Merge commit '0e5e77ce11b9d0f7d4ce0a2a9d92fce203793271'

* commit '0e5e77ce11b9d0f7d4ce0a2a9d92fce203793271':
  Add another testcase for moto to reproduce bug #2099685 to the stagefright commandline app.
2009-09-04 11:04:17 -07:00
Wink Saville
80bd403a3f am 82534558: am ccc41a26: Merge change 23870 into eclair
Merge commit '82534558bdf3e2c37391662195cfe9a144e38076'

* commit '82534558bdf3e2c37391662195cfe9a144e38076':
  Allow hasIccCard to be useable by any processes.
2009-09-04 11:03:59 -07:00
Jason Sams
312c89ad25 am 2d666c4c: am 4879d0d0: Merge change 23890 into eclair
Merge commit '2d666c4cbe488551a3c049b314c703371c73f468'

* commit '2d666c4cbe488551a3c049b314c703371c73f468':
  Improve structure support using symbol lookup of named structures in scripts to allow them to appear as just pointers to structs.
2009-09-04 11:03:50 -07:00
Grace Kloba
3d031d2a19 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
Grace Kloba
e5b6d02f34 Translate the content dimension to the view space before setting them to the view.
Fix http://b/issue?id=2027254
2009-09-04 10:34:14 -07:00
Mike Lockwood
267e621468 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
Mike Lockwood
445f43081e NotificationManagerService: Only blink red battery low LED when not charging.
Change-Id: Ie5836ae99d4ca19d9d062e7c78c8b40cd8d6c29d
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-09-04 11:06:46 -04:00
Jean-Baptiste Queru
3c193a4a8d merge from open-source master 2009-09-04 07:54:30 -07:00
Eddie Ho
8e739ac69f 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
7111904802 Merge change 23949 into eclair
* changes:
  GPS: Fix race condition reporting NMEA data.
2009-09-04 04:49:11 -07:00
Eddie Ho
eb40aae254 GPS: Fix race condition reporting NMEA data.
Change-Id: I80997e2686d9c08d7d2def094f9922e83cf41013
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-09-04 07:05:08 -04:00
Andrei Popescu
13e3e0ab9a 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
34619494e0 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
Chih-Chung Chang
5962d279f9 Add more documents on the ACTION_SEND_MULTIPLE intent.
Change-Id: Ic3d7b74299611158470b729be654fbadde1691ff
2009-09-04 15:16:06 +08:00
Jesse Wilson
1cdacef021 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
f163f7f0f2 do not merge: fix API current.xml for Hashtable. 2009-09-03 18:20:50 -07:00
Jesse Wilson
6ffca3534c 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
Jesse Wilson
6de753bffe do not merge: update API for Josh's optimizations for Eclair 2009-09-03 17:48:11 -07:00
Dmitri Plotnikov
da32be5e06 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
1ab3ebad95 Merge change 23906 into eclair
* changes:
  Removing references to deprecated API and the deprecated API itself.
2009-09-03 16:29:44 -07:00
Dmitri Plotnikov
b1e2a4d0d0 Removing references to deprecated API and the deprecated API itself. 2009-09-03 16:27:37 -07:00
Andreas Huber
0e5e77ce11 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
a19cb68b2d 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
Andreas Huber
54ee7849ab Add another testcase for moto to reproduce bug #2099685 to the stagefright commandline app. 2009-09-03 16:09:33 -07:00
Wink Saville
82534558bd 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
ccc41a26b8 Merge change 23870 into eclair
* changes:
  Allow hasIccCard to be useable by any processes.
2009-09-03 15:54:22 -07:00
Jason Sams
2d666c4cbe 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
4879d0d0a4 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
Ken Shirriff
6fd7385f56 Add sync_details support.
This adds sync_details logging to AbstractThreadedSyncAdapter and thus
the new contacts code.
2009-09-03 15:43:21 -07:00