28810 Commits

Author SHA1 Message Date
Wu-cheng Li
24844c9a30 am a2527055: am c8696023: Merge "Document that autoFocus must be called in auto and macro mode." into gingerbread
Merge commit 'a2527055f8e3106fe70feeee10ae0c4ddc6596e9'

* commit 'a2527055f8e3106fe70feeee10ae0c4ddc6596e9':
  Document that autoFocus must be called in auto and macro mode.
2010-08-18 14:22:02 -07:00
Andreas Huber
f5a36b24ac am 00557baf: am 4dda6ddb: Merge "Make the OggExtractor less verbose." into gingerbread
Merge commit '00557baf36ab62592ae1c424a7298a21e8588f5a'

* commit '00557baf36ab62592ae1c424a7298a21e8588f5a':
  Make the OggExtractor less verbose.
2010-08-18 14:21:57 -07:00
Andreas Huber
c7dbac57e2 am 31eb1ac1: am 0324ce9a: Merge "Be more lenient when validating ESDS information in mp4 audio tracks. Allow the absence of any codec specific data and assume that the mpeg4 headers are not lying to us." into gingerbread
Merge commit '31eb1ac1db38d0a5cd0b44dd5251941992f74b58'

* commit '31eb1ac1db38d0a5cd0b44dd5251941992f74b58':
  Be more lenient when validating ESDS information in mp4 audio tracks. Allow the absence of any codec specific data and assume that the mpeg4 headers are not lying to us.
2010-08-18 14:21:51 -07:00
Steve Howard
1944cca612 am 0899e8bc: am baf3869b: Merge "Fix up handling of null fields in DownloadManager." into gingerbread
Merge commit '0899e8bc9dc44249d6be016bed71a9ecee56f132'

* commit '0899e8bc9dc44249d6be016bed71a9ecee56f132':
  Fix up handling of null fields in DownloadManager.
2010-08-18 14:21:44 -07:00
Kenny Root
14b2ff4f53 am 7a11ae26: am face0c02: am 46906276: Amend previous ndc commit
Merge commit '7a11ae268cfd9cd1a7887217c926bec19fdccf17'

* commit '7a11ae268cfd9cd1a7887217c926bec19fdccf17':
  Amend previous ndc commit
2010-08-18 14:21:38 -07:00
Kenny Root
b8a5db80e2 am 8eaacf46: am e2f95e42: am a34c9ca3: (-s ours) Add more error checking for ndc
Merge commit '8eaacf46dc3bf2f267e5382dfbd9ab6dc06e3e9f'

* commit '8eaacf46dc3bf2f267e5382dfbd9ab6dc06e3e9f':
  Add more error checking for ndc
2010-08-18 14:21:28 -07:00
David 'Digit' Turner
edf998b156 am 4ad26d71: am a6b47cd3: am 24a03083: PackageManagerService: always install native binaries from .apk
Merge commit '4ad26d7131c4903f32dede444b78c2b1989327ec'

* commit '4ad26d7131c4903f32dede444b78c2b1989327ec':
  PackageManagerService: always install native binaries from .apk
2010-08-18 14:21:22 -07:00
Hung-ying Tyan
f2b4a15e18 am fa9a38c5: am 6ab94608: Merge "CallManager: add setAudioMode()" into gingerbread
Merge commit 'fa9a38c566d09a4c891d584ed3d3af9690967b31'

* commit 'fa9a38c566d09a4c891d584ed3d3af9690967b31':
  CallManager: add setAudioMode()
2010-08-18 14:21:15 -07:00
Jeff Brown
a9abfa54d3 am 29eb491a: am 3922484d: Merge "Optimize EventHub reads." into gingerbread
Merge commit '29eb491a5addc78003299ecab6ab6c716201f9dc'

* commit '29eb491a5addc78003299ecab6ab6c716201f9dc':
  Optimize EventHub reads.
2010-08-18 14:21:07 -07:00
Hung-ying Tyan
1c66bfb37e am dc7d7378: am 8eac20ea: SIP: implement conference call
Merge commit 'dc7d73783e0416cbfde6053a037ce32c8f35fbc4'

* commit 'dc7d73783e0416cbfde6053a037ce32c8f35fbc4':
  SIP: implement conference call
2010-08-18 14:20:49 -07:00
Hung-ying Tyan
38311b33c8 am 16848a15: am f6354aca: Merge "CallManager: do not deliver ring event if fg call is live." into gingerbread
Merge commit '16848a15bbb7648bb1298c91f7969073c106115c'

* commit '16848a15bbb7648bb1298c91f7969073c106115c':
  CallManager: do not deliver ring event if fg call is live.
2010-08-18 14:20:41 -07:00
Eric Fischer
e68de480fd am 8cbaf59e: (-s ours) am 04e5a1cb: Merge "Import revised translations. DO NOT MERGE" into gingerbread
Merge commit '8cbaf59e313227d41c9881fbedb4dc3255a83b8d'

* commit '8cbaf59e313227d41c9881fbedb4dc3255a83b8d':
  Import revised translations.  DO NOT MERGE
2010-08-18 14:20:33 -07:00
Jeff Brown
671cc0ec30 am 8fd80e92: am 72ce4235: Merge "Fix possible race conditions during channel unregistration." into gingerbread
Merge commit '8fd80e924a2f40f6a785f834914f8a6f18a3aa9d'

* commit '8fd80e924a2f40f6a785f834914f8a6f18a3aa9d':
  Fix possible race conditions during channel unregistration.
2010-08-18 14:20:24 -07:00
Irfan Sheriff
f96a508d06 am aea40e3c: (-s ours) am a1af0d7c: Merge "Fix SDK build" into gingerbread
Merge commit 'aea40e3c5746d754f96b76b7845bbbf7effe2677'

* commit 'aea40e3c5746d754f96b76b7845bbbf7effe2677':
  Fix SDK build
2010-08-18 14:20:16 -07:00
Daisuke Miyakawa
8902abb7ff am a7bb3ba5: (-s ours) am f996ed9f: Merge "Make vCard importer/exporter aware of multi-byte parameters." into gingerbread
Merge commit 'a7bb3ba54aed70919c8304ae4227ab5106243f75'

* commit 'a7bb3ba54aed70919c8304ae4227ab5106243f75':
  Make vCard importer/exporter aware of multi-byte parameters.
2010-08-18 14:08:03 -07:00
Adam Powell
b1703f439c Merge "Back button closes ActionModes" 2010-08-18 14:01:33 -07:00
Wu-cheng Li
a2527055f8 am c8696023: Merge "Document that autoFocus must be called in auto and macro mode." into gingerbread
Merge commit 'c86960236d5b2095c87bf46de2400a905acabee2' into gingerbread-plus-aosp

* commit 'c86960236d5b2095c87bf46de2400a905acabee2':
  Document that autoFocus must be called in auto and macro mode.
2010-08-18 13:39:01 -07:00
Andreas Huber
00557baf36 am 4dda6ddb: Merge "Make the OggExtractor less verbose." into gingerbread
Merge commit '4dda6ddb25e904c17dcb3012dd229df6ae4692cd' into gingerbread-plus-aosp

* commit '4dda6ddb25e904c17dcb3012dd229df6ae4692cd':
  Make the OggExtractor less verbose.
2010-08-18 13:38:53 -07:00
Andreas Huber
31eb1ac1db am 0324ce9a: Merge "Be more lenient when validating ESDS information in mp4 audio tracks. Allow the absence of any codec specific data and assume that the mpeg4 headers are not lying to us." into gingerbread
Merge commit '0324ce9a1e21ed66e00d6560c27a6faf6d151f68' into gingerbread-plus-aosp

* commit '0324ce9a1e21ed66e00d6560c27a6faf6d151f68':
  Be more lenient when validating ESDS information in mp4 audio tracks. Allow the absence of any codec specific data and assume that the mpeg4 headers are not lying to us.
2010-08-18 13:38:49 -07:00
Steve Howard
0899e8bc9d am baf3869b: Merge "Fix up handling of null fields in DownloadManager." into gingerbread
Merge commit 'baf3869b88ab4e31f792dbe08f61725bc3619ea8' into gingerbread-plus-aosp

* commit 'baf3869b88ab4e31f792dbe08f61725bc3619ea8':
  Fix up handling of null fields in DownloadManager.
2010-08-18 13:38:42 -07:00
Kenny Root
7a11ae268c am face0c02: am 46906276: Amend previous ndc commit
Merge commit 'face0c02a0c47f8585fa578d5a85a8fc37322326' into gingerbread-plus-aosp

* commit 'face0c02a0c47f8585fa578d5a85a8fc37322326':
  Amend previous ndc commit
2010-08-18 13:38:36 -07:00
Kenny Root
8eaacf46dc am e2f95e42: am a34c9ca3: (-s ours) Add more error checking for ndc
Merge commit 'e2f95e42c2ba27c7739b80ab9f52d1acfe1643e7' into gingerbread-plus-aosp

* commit 'e2f95e42c2ba27c7739b80ab9f52d1acfe1643e7':
  Add more error checking for ndc
2010-08-18 13:38:30 -07:00
David 'Digit' Turner
4ad26d7131 am a6b47cd3: am 24a03083: PackageManagerService: always install native binaries from .apk
Merge commit 'a6b47cd39a1aa01d807bc24839863ce0a0218b46' into gingerbread-plus-aosp

* commit 'a6b47cd39a1aa01d807bc24839863ce0a0218b46':
  PackageManagerService: always install native binaries from .apk
2010-08-18 13:38:24 -07:00
Hung-ying Tyan
fa9a38c566 am 6ab94608: Merge "CallManager: add setAudioMode()" into gingerbread
Merge commit '6ab94608750776bcaaee56696cfcfb16ce29db8a' into gingerbread-plus-aosp

* commit '6ab94608750776bcaaee56696cfcfb16ce29db8a':
  CallManager: add setAudioMode()
2010-08-18 13:37:50 -07:00
Jeff Brown
29eb491a5a am 3922484d: Merge "Optimize EventHub reads." into gingerbread
Merge commit '3922484d7458a4ab72fc1ca8952a0776dd1c7d20' into gingerbread-plus-aosp

* commit '3922484d7458a4ab72fc1ca8952a0776dd1c7d20':
  Optimize EventHub reads.
2010-08-18 13:37:44 -07:00
Hung-ying Tyan
dc7d73783e am 8eac20ea: SIP: implement conference call
Merge commit '8eac20eacd088793547c56e14d602b28d62fb278' into gingerbread-plus-aosp

* commit '8eac20eacd088793547c56e14d602b28d62fb278':
  SIP: implement conference call
2010-08-18 13:37:25 -07:00
Hung-ying Tyan
16848a15bb am f6354aca: Merge "CallManager: do not deliver ring event if fg call is live." into gingerbread
Merge commit 'f6354aca3a4d0571a66747d9cdc247a1d411d660' into gingerbread-plus-aosp

* commit 'f6354aca3a4d0571a66747d9cdc247a1d411d660':
  CallManager: do not deliver ring event if fg call is live.
2010-08-18 13:37:11 -07:00
Eric Fischer
8cbaf59e31 am 04e5a1cb: Merge "Import revised translations. DO NOT MERGE" into gingerbread
Merge commit '04e5a1cba9671d2d6b07dbb9bc3b8d18fa610321' into gingerbread-plus-aosp

* commit '04e5a1cba9671d2d6b07dbb9bc3b8d18fa610321':
  Import revised translations.  DO NOT MERGE
2010-08-18 13:36:29 -07:00
Jeff Brown
8fd80e924a am 72ce4235: Merge "Fix possible race conditions during channel unregistration." into gingerbread
Merge commit '72ce42352c1c229e05d910b4176f3cddb608e814' into gingerbread-plus-aosp

* commit '72ce42352c1c229e05d910b4176f3cddb608e814':
  Fix possible race conditions during channel unregistration.
2010-08-18 13:36:08 -07:00
Irfan Sheriff
aea40e3c57 am a1af0d7c: Merge "Fix SDK build" into gingerbread
Merge commit 'a1af0d7c80a0119630926810644e6cdee481ba80' into gingerbread-plus-aosp

* commit 'a1af0d7c80a0119630926810644e6cdee481ba80':
  Fix SDK build
2010-08-18 13:36:01 -07:00
Daisuke Miyakawa
a7bb3ba54a am f996ed9f: Merge "Make vCard importer/exporter aware of multi-byte parameters." into gingerbread
Merge commit 'f996ed9f2e4a992e5d884077a15dcc23a8d90c44' into gingerbread-plus-aosp

* commit 'f996ed9f2e4a992e5d884077a15dcc23a8d90c44':
  Make vCard importer/exporter aware of multi-byte parameters.
2010-08-18 13:35:47 -07:00
Jean-Baptiste Queru
71f72c37e9 am 3719f856: (-s ours) DO NOT MERGE resolved conflicts for merge of 8c11e952 to gingerbread-plus-aosp
Merge commit '3719f8568e809ffd30f90adc38993256a9d3d066'

* commit '3719f8568e809ffd30f90adc38993256a9d3d066':
  DO NOT MERGE WifiLock extensions for high performance mode
2010-08-18 13:35:33 -07:00
Jean-Baptiste Queru
bd1355db51 am f9395185: (-s ours) Revert "- updates NetUtils to use new libnetutils headers"
Merge commit 'f93951851052f14e3263adff22266b61f487b018'

* commit 'f93951851052f14e3263adff22266b61f487b018':
  Revert "- updates NetUtils to use new libnetutils headers"
2010-08-18 13:35:26 -07:00
Jean-Baptiste Queru
3719f8568e DO NOT MERGE resolved conflicts for merge of 8c11e952 to gingerbread-plus-aosp
Change-Id: I29703133654f0f80a4425914d290e9dc50cbc3cc
2010-08-18 13:20:28 -07:00
Romain Guy
cadef53810 Merge "Fix the build." 2010-08-18 12:58:06 -07:00
Romain Guy
1f8c9602ee Fix the build.
Change-Id: I8bd418ba21e3e3f68b793030398d1a5e933dfb19
2010-08-18 12:57:31 -07:00
Jeff Hamilton
5d595f6d83 Merge "Switch the methods in Browser over to the new provider." 2010-08-18 12:57:10 -07:00
Shimeng (Simon) Wang
c1cba781d3 Use fixed viewpport for tablet device.
This makes the zoom animation much more smooth.  With previous dynamic
viewport, the animation jumps because of viewport adjustment and big
screen.

Also the viewport width is changed from 800 to 1040 to better suit
the tablet device.  It's the middle point of 1280 and 800.

The text reflow re-alignment for non-double-tap zoom is disabled for
tablet, since most of the time the reflow has no effect.

issue: 2919307
Change-Id: I74493df6408291c24ef8511512d7ed0b81bf507a
2010-08-18 12:45:12 -07:00
Jason Sams
2f728bf441 Merge "Fix bug looping non-blocking fifos." 2010-08-18 12:39:59 -07:00
Jason Sams
2ea56efb1f Merge "Remove OOB object destruction." 2010-08-18 12:39:38 -07:00
Jason Sams
d0cb106ff2 Fix bug looping non-blocking fifos.
Change-Id: I33dcf575466bfef672af4e113ad692397b5213e9
2010-08-18 12:38:03 -07:00
Adam Powell
04253aa134 Back button closes ActionModes
Change-Id: I763782706ce7aa65a5a11129450d97a2bcb3a625
2010-08-18 11:59:16 -07:00
Leon Scroggins
2aed776142 Change focusController only when WebView gains/loses focus.
Bug: 2582455

A corresponding webkit change eliminates the rest of the calls
to change the active and focused state of the focus controller.

Change-Id: I18868b7480ba5daae71375d109d5a721ecf22b4d
2010-08-18 14:55:18 -04:00
Romain Guy
756879836b Merge "Layers were using an extra Snapshot causing extra clipping." 2010-08-18 11:51:25 -07:00
Mike Lockwood
b01a5efe92 Merge changes Ic0e611f5,Ic06d754e
* changes:
  MTP: Remove retry loop from MTP server code
  MTP: Compatibility fixes for transferring strings
2010-08-18 11:50:49 -07:00
Romain Guy
2542d19974 Layers were using an extra Snapshot causing extra clipping.
Bug #2919310

Change-Id: I72ccd44bba7a3f3db72f581aa96198b6226e4478
2010-08-18 11:47:12 -07:00
Romain Guy
4fbcdbbb7b Merge "Resize default xlarge wallpaper." 2010-08-18 11:40:22 -07:00
Romain Guy
a8031c68c8 Resize default xlarge wallpaper.
Change-Id: Iecab1b2a99d6f7ca1c85f6727fcb2ef21842b1f6
2010-08-18 11:39:52 -07:00
Jean-Baptiste Queru
f939518510 Revert "- updates NetUtils to use new libnetutils headers"
This reverts commit 9bf3bb21c097cc96f30d9bf3ec7dea62a74a738b.
2010-08-18 11:16:42 -07:00
Dmitri Plotnikov
e50ed08afc Unhiding Contact Directory APIs
These APIs need to be public to allow integration
with Focus, which is unbundled.

The design document can be found here: http://goto/android-gal-integration

Change-Id: I14e749e485e301e8af5a657cc798e581dec21394
2010-08-18 11:12:35 -07:00