Commit Graph

5912 Commits

Author SHA1 Message Date
Nick Pelly
6f603d8bf5 am 285f2422: Merge change I28bad882 into eclair
Merge commit '285f242214d38352b844898edffc8eb336d0c19e' into eclair-plus-aosp

* commit '285f242214d38352b844898edffc8eb336d0c19e':
  Fix broken build.
2009-09-30 12:16:01 -07:00
Android (Google) Code Review
b557d88929 Merge change I28bad882 into eclair
* changes:
  Fix broken build.
2009-09-30 15:08:29 -04:00
Amith Yamasani
dd66622548 am 86aece8b: Merge change I8dfd6ea8 into eclair
Merge commit '86aece8b4ad6d55cc9a3c185c3730d7387a46661' into eclair-plus-aosp

* commit '86aece8b4ad6d55cc9a3c185c3730d7387a46661':
  Handle bad lines in /proc/wakelocks : Fix for 2124260
2009-09-30 11:56:01 -07:00
Evan Millar
3e45fb9706 am 1537a255: Merge change I46a6d39c into eclair
Merge commit '1537a25520405f384b072c58fee935a29c4e14ea' into eclair-plus-aosp

* commit '1537a25520405f384b072c58fee935a29c4e14ea':
  Remove unused api in QuickContact.java and fix the build.
2009-09-30 11:55:47 -07:00
Android (Google) Code Review
6d5df0f893 Merge change I8dfd6ea8 into eclair
* changes:
  Handle bad lines in /proc/wakelocks : Fix for 2124260
2009-09-30 14:49:21 -04:00
Daisuke Miyakawa
abfe482cda am 255d51cc: Merge change Ia6fc04c8 into eclair
Merge commit '255d51ccac792305253dc5953e136dae65e74266' into eclair-plus-aosp

* commit '255d51ccac792305253dc5953e136dae65e74266':
  Remove android.syncml package completely.
2009-09-30 11:46:53 -07:00
Zhu Lan
fd5b757d62 am e5661c40: Merge change I8366852f into eclair
Merge commit 'e5661c40a62dc3556ece353b3b74fdde249c228e' into eclair-plus-aosp

* commit 'e5661c40a62dc3556ece353b3b74fdde249c228e':
  Bluetooth A2DP suspend/resume functionality
2009-09-30 11:46:40 -07:00
Android (Google) Code Review
07347f195f Merge change I46a6d39c into eclair
* changes:
  Remove unused api in QuickContact.java and fix the build.
2009-09-30 14:45:17 -04:00
Android (Google) Code Review
313cdbfcd8 Merge change Ia6fc04c8 into eclair
* changes:
  Remove android.syncml package completely.
2009-09-30 14:37:34 -04:00
Android (Google) Code Review
25b7594a74 Merge change I8366852f into eclair
* changes:
  Bluetooth A2DP suspend/resume functionality
2009-09-30 14:24:46 -04:00
Mike Cleron
fd0f9b2f10 am 170d9df0: Merge change I2d4deb11 into eclair
Merge commit '170d9df0f3e3d7ad5652ccfe0d0bd53d74685d1d' into eclair-plus-aosp

* commit '170d9df0f3e3d7ad5652ccfe0d0bd53d74685d1d':
  Placeholder mdpi assets
2009-09-30 11:23:06 -07:00
Daisuke Miyakawa
35e820a48f am 85d86af9: Merge change I82be558f into eclair
Merge commit '85d86af982026145aa69a4ca280d394b9ea90372' into eclair-plus-aosp

* commit '85d86af982026145aa69a4ca280d394b9ea90372':
  Fix vCard composer in three points.
2009-09-30 11:18:04 -07:00
Fred Quintana
e06789fe6a am 609c2c08: Merge change Ia54b1bf0 into eclair
Merge commit '609c2c08d7d059681434ea322b551264abab8a71' into eclair-plus-aosp

* commit '609c2c08d7d059681434ea322b551264abab8a71':
  - make SyncManager get the accounts list during the constructor,
2009-09-30 11:17:52 -07:00
Android (Google) Code Review
dbc7619faf Merge change I2d4deb11 into eclair
* changes:
  Placeholder mdpi assets
2009-09-30 14:17:23 -04:00
Android (Google) Code Review
a3d8ef66c8 Merge change I82be558f into eclair
* changes:
  Fix vCard composer in three points.
2009-09-30 14:11:52 -04:00
Android (Google) Code Review
88bb49c907 Merge change Ia54b1bf0 into eclair
* changes:
  - make SyncManager get the accounts list during the constructor,   which will allow syncs to be scheduled during bootup. The   providers need this so that they can potentially schedule   syncs while they are starting up. - make the SyncManager message handler wait until boot   has completed to start dispatching messages
2009-09-30 14:10:01 -04:00
Jaikumar Ganesh
8d2ad4ee5c am 017c5de1: Merge change I78c4e64a into eclair
Merge commit '017c5de1cf1228664da84b31012a386c2eac2232' into eclair-plus-aosp

* commit '017c5de1cf1228664da84b31012a386c2eac2232':
  Query from Bluez if name is not present in cache.
2009-09-30 11:01:12 -07:00
Android (Google) Code Review
d325a62d6e Merge change I78c4e64a into eclair
* changes:
  Query from Bluez if name is not present in cache.
2009-09-30 13:55:11 -04:00
Dave Sparks
87c5901f21 am 8b781403: Merge change Id0ac8c08 into eclair
Merge commit '8b781403f183fa3616accd1e243d02168a9b9b1d' into eclair-plus-aosp

* commit '8b781403f183fa3616accd1e243d02168a9b9b1d':
  Reduce the log spew from AudioFlinger due to a certain device that can't meet latency timing. Bug 2142215.
2009-09-30 10:09:07 -07:00
Evan Millar
062a90fee1 am 1935a341: Merge change I9d12beeb into eclair
Merge commit '1935a3417e986d38b9a0d981c3dbd06acf75a9fc' into eclair-plus-aosp

* commit '1935a3417e986d38b9a0d981c3dbd06acf75a9fc':
  Change FasttrackBadgeWidget->QuickContactBadge and make public.
2009-09-30 10:08:59 -07:00
Android (Google) Code Review
f0b16c573d Merge change Id0ac8c08 into eclair
* changes:
  Reduce the log spew from AudioFlinger due to a certain device that can't meet latency timing. Bug 2142215.
2009-09-30 13:03:44 -04:00
Android (Google) Code Review
a336c329fa Merge change I9d12beeb into eclair
* changes:
  Change FasttrackBadgeWidget->QuickContactBadge and make public.
2009-09-30 13:00:46 -04:00
Robert Greenwalt
b6f089c404 am a3431e4c: Merge change I84612ea6 into eclair
Merge commit 'a3431e4c7d6307b845d7008955d99425d842ff72' into eclair-plus-aosp

* commit 'a3431e4c7d6307b845d7008955d99425d842ff72':
  Add a delay to wifi driver stop on screen off.
2009-09-30 09:33:20 -07:00
Android (Google) Code Review
bad2238b99 Merge change I84612ea6 into eclair
* changes:
  Add a delay to wifi driver stop on screen off.
2009-09-30 12:28:14 -04:00
Andrei Popescu
136fc53b4d am 6e58cf21: Merge change I020d2e34 into eclair
Merge commit '6e58cf21088c2e6b0ef52572bfd544347e02fc17' into eclair-plus-aosp

* commit '6e58cf21088c2e6b0ef52572bfd544347e02fc17':
  Invoke the OnErrorListener callback when MediaPlayer.setDataSource() throws.
2009-09-30 09:13:33 -07:00
Android (Google) Code Review
d088bdbdf5 Merge change I020d2e34 into eclair
* changes:
  Invoke the OnErrorListener callback when MediaPlayer.setDataSource() throws.
2009-09-30 12:07:24 -04:00
Bryan Mawhinney
a3c8406a69 am fb54aadd: Merge change Ic3aa7aa6 into eclair
Merge commit 'fb54aaddf25c8b60e57239880663655ec76a1e8d' into eclair-plus-aosp

* commit 'fb54aaddf25c8b60e57239880663655ec76a1e8d':
  Recreate search dialog view each time it's shown.
2009-09-30 08:11:43 -07:00
Cary Clark
89b8ab334d am 0c5924e9: preserve webkit-side text selection
Merge commit '0c5924e9dd1befadae8c73505d3acc9813bf8224' into eclair-plus-aosp

* commit '0c5924e9dd1befadae8c73505d3acc9813bf8224':
  preserve webkit-side text selection
2009-09-30 08:11:36 -07:00
Android (Google) Code Review
10c55be04b Merge change Ic3aa7aa6 into eclair
* changes:
  Recreate search dialog view each time it's shown.
2009-09-30 11:06:59 -04:00
Jack Palevich
ccc2409644 am b386a86c: Merge change I8018f091 into eclair
Merge commit 'b386a86c1c131832c8f9955a5a57a2fa13609d15' into eclair-plus-aosp

* commit 'b386a86c1c131832c8f9955a5a57a2fa13609d15':
  Add very simple input path. Fix end-of-line issues.
2009-09-30 06:23:57 -07:00
Android (Google) Code Review
e9321e3abb Merge change I8018f091 into eclair
* changes:
  Add very simple input path. Fix end-of-line issues.
2009-09-30 09:15:16 -04:00
Jack Palevich
e5810d1f98 Add very simple input path. Fix end-of-line issues. 2009-09-30 06:14:24 -07:00
Mike Reed
cc183e52c3 am 9fcd581a: Merge change I4e03999c into eclair
Merge commit '9fcd581a022abec565e3bf65c3ed4aaecf7d1555' into eclair-plus-aosp

* commit '9fcd581a022abec565e3bf65c3ed4aaecf7d1555':
  if we have a single value for roundrect radius, manually clamp it before drawing.
2009-09-30 06:04:43 -07:00
Android (Google) Code Review
4af88305ed Merge change I4e03999c into eclair
* changes:
  if we have a single value for roundrect radius, manually clamp it before drawing.
2009-09-30 08:56:17 -04:00
Hung-ying Tyan
a2628879ea am 2df1cc43: Merge change I42a80783 into eclair
Merge commit '2df1cc437793d50609c575881c04cc2c63d0bd97' into eclair-plus-aosp

* commit '2df1cc437793d50609c575881c04cc2c63d0bd97':
  Remove deprecated VpnType.getDescription().
2009-09-30 03:50:30 -07:00
Android (Google) Code Review
93a3f13478 Merge change I42a80783 into eclair
* changes:
  Remove deprecated VpnType.getDescription().
2009-09-30 06:45:17 -04:00
Hung-ying Tyan
baf911d720 Remove deprecated VpnType.getDescription(). 2009-09-30 18:39:48 +08:00
Leon Clarke
f2e9c3cf2a am ccf6947e: Merge change Ib89f80df into eclair
Merge commit 'ccf6947eaaa5f7af57290dcdcdfbabe0a8985015' into eclair-plus-aosp

* commit 'ccf6947eaaa5f7af57290dcdcdfbabe0a8985015':
  Re-instate the link coloring on startup, but going via the browser
2009-09-30 03:11:50 -07:00
Jim Miller
c78014b4a5 am badfac38: Merge change I85d63002 into eclair
Merge commit 'badfac3825c6f6823e77fe53eab79ffbb8caef4c' into eclair-plus-aosp

* commit 'badfac3825c6f6823e77fe53eab79ffbb8caef4c':
  Fix for 2139014: Allow platform customization of vibration pattern in LockScreenView.
2009-09-30 03:11:42 -07:00
Dave Sparks
8a95a45fd9 Reduce the log spew from AudioFlinger due to a certain device that can't meet latency timing. Bug 2142215. 2009-09-30 03:09:03 -07:00
Android (Google) Code Review
78394204f3 Merge change Ib89f80df into eclair
* changes:
  Re-instate the link coloring on startup, but going via the browser to read the bookmark history, and restricting it to 100 results.
2009-09-30 06:08:08 -04:00
Android (Google) Code Review
560a678fb6 Merge change I85d63002 into eclair
* changes:
  Fix for 2139014: Allow platform customization of vibration pattern in LockScreenView.
2009-09-30 06:07:00 -04:00
Hung-ying Tyan
7ad0014163 am f2bd9017: make vpn type strings i18n ready.
Merge commit 'f2bd901738736e16ea93f0a4c7275f2141ca3a3e' into eclair-plus-aosp

* commit 'f2bd901738736e16ea93f0a4c7275f2141ca3a3e':
  make vpn type strings i18n ready.
2009-09-30 02:42:14 -07:00
Hung-ying Tyan
926c4b2527 make vpn type strings i18n ready. 2009-09-30 17:07:10 +08:00
Mike Cleron
9be78abc92 am 4ca8c837: Merge change Ia4087911 into eclair
Merge commit '4ca8c837d3aca781e0ba641ed4353827bfd05805' into eclair-plus-aosp

* commit '4ca8c837d3aca781e0ba641ed4353827bfd05805':
  Newer icons
2009-09-30 01:36:11 -07:00
Android (Google) Code Review
7cbc8668df Merge change Ia4087911 into eclair
* changes:
  Newer icons
2009-09-30 04:26:06 -04:00
Ray Chen
21a8afd915 am 3ba35126: update current.xml for cancelThumbnailRequest api.
Merge commit '3ba351267a3815a3c9a08e2ac7f62a39f83d7776' into eclair-plus-aosp

* commit '3ba351267a3815a3c9a08e2ac7f62a39f83d7776':
  update current.xml for cancelThumbnailRequest api.
2009-09-30 00:16:53 -07:00
Ray Chen
212c57f3a5 am 49e750a3: Merge change I7495977a into eclair
Merge commit '49e750a3586cdb09aa1a374442af48982b225050' into eclair-plus-aosp

* commit '49e750a3586cdb09aa1a374442af48982b225050':
  Add cancelThumbnailRequest to thumbnail API.
2009-09-30 00:07:08 -07:00
Android (Google) Code Review
9b4596a60b Merge change I7495977a into eclair
* changes:
  Add cancelThumbnailRequest to thumbnail API.
2009-09-30 02:59:56 -04:00
Jianhong Jiang
a0b99fcc9f am 37b0f279: Merge change I999f1aeb into eclair
Merge commit '37b0f279a6a237ae366c4861cde3f774f5ab811c' into eclair-plus-aosp

* commit '37b0f279a6a237ae366c4861cde3f774f5ab811c':
  Remove audio latency fudge factor 96 msec.
2009-09-29 23:23:08 -07:00