29093 Commits

Author SHA1 Message Date
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
Mathias Agopian
a6704d39b3 Improve documentation of getAltitude
Change-Id: Ie6c61fa6018e54143cec6e65978df9abb48854d9
2010-08-18 12:00:30 -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
Konstantin Lopyrev
f2af87b39b Merge "Making sure the draw time is measured." into gingerbread 2010-08-18 11:43:21 -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
Konstantin Lopyrev
bef337f516 Making sure the draw time is measured.
Change-Id: I6bf8094aee03793f125008386c4fea730e95d07a
2010-08-18 11:31:27 -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
Jens Gulin
c4554b9a08 Keep track of remaining fd when devices are removed
Sometimes the wrong fd was accessed when the device was addressed
by device id.

The earlier implementation assumed that two arrays were in sync
but one of them was compacted when devices were removed. Instead
of that dependency the device now keeps track of it's file descriptor.

Change-Id: Ib0f320603aafb07ded354bc3687de9759c9068f2
2010-08-18 10:54:03 -07:00
Amith Yamasani
59f3a757b5 Merge "Make getListView() public and hidden, as it is needed for WifiSettings." 2010-08-18 10:42:39 -07:00
Mike Lockwood
2b2bff5d98 MTP: Remove retry loop from MTP server code
This should eliminate the spammy logging that my coworkers have noticed.

Change-Id: Ic0e611f5277dd13651490cbe5f7ded5f6e17db4f
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-08-18 13:31:48 -04:00
Mike Lockwood
9e837861b2 MTP: Compatibility fixes for transferring strings
Change-Id: Ic06d754ee68b0389439cdc34f73adff0f2b33afa
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-08-18 13:31:46 -04:00
Brian Carlstrom
d313cab46e Merge "tracking merge of external/apache-http from dalvik-dev" into gingerbread 2010-08-18 10:21:28 -07:00
Wu-cheng Li
c86960236d Merge "Document that autoFocus must be called in auto and macro mode." into gingerbread 2010-08-18 10:19:45 -07:00
Andreas Huber
af063a67b2 Better support for rtsp streamed through VLC. Temporarily make the socket blocking to read all of the session description.
Change-Id: Ibe71f5941485660510e24d714da3865b9c6f89a2
2010-08-18 10:17:18 -07:00
Andreas Huber
4dda6ddb25 Merge "Make the OggExtractor less verbose." into gingerbread 2010-08-18 10:10:14 -07:00
Andreas Huber
0324ce9a1e 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 2010-08-18 10:07:29 -07:00
Steve Block
487300abe1 Merge "Implement logic for new Geolocation delayed permission LayoutTests" 2010-08-18 09:59:33 -07:00
Andreas Huber
08c94b265c 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.
Change-Id: Ia29b967cbee9eabb21c6c26508b27b379ff9ba17
2010-08-18 09:58:30 -07:00
Steve Block
3374dce303 Merge "Fix naming and executable bits on DumpRenderTree2 scripts" 2010-08-18 09:52:35 -07:00
Xia Wang
0dde515777 Merge "Add setRadioState to MockRilController and the corresponding test case. Add test case for setRadioState command in Mock Ril" 2010-08-18 09:45:45 -07:00
Kenny Root
02ca31fbae Add OBB flags to support overlays
* Add flags field in OBB footer to support overlays.

* Remove unused 'crypto' and 'filesystem' fields in obbtool (could
  later be supported in the "flags" field of the OBB footer).

* Add notes to document OBB classes before shipping.

Change-Id: I386b43c32c5edef55210acb5d3322639c08010ba
2010-08-18 09:34:58 -07:00
Jeff Hamilton
6f42edc207 Switch the methods in Browser over to the new provider.
Change-Id: I070db67989cc01b50ef0f64cb8f8652b9a1a587d
2010-08-18 11:12:05 -05:00
Steve Howard
baf3869b88 Merge "Fix up handling of null fields in DownloadManager." into gingerbread 2010-08-18 09:03:34 -07:00
Kenny Root
face0c02a0 am 46906276: Amend previous ndc commit
Merge commit '46906276448dd36e7a5cca38fbe9fdb3142f7948' into gingerbread

* commit '46906276448dd36e7a5cca38fbe9fdb3142f7948':
  Amend previous ndc commit
2010-08-18 08:50:59 -07:00
Kenny Root
e2f95e42c2 am a34c9ca3: (-s ours) Add more error checking for ndc
Merge commit 'a34c9ca30ea25d0c4d8ae51da7858c4ea58b7f25' into gingerbread

* commit 'a34c9ca30ea25d0c4d8ae51da7858c4ea58b7f25':
  Add more error checking for ndc
2010-08-18 08:50:56 -07:00
David 'Digit' Turner
a6b47cd39a am 24a03083: PackageManagerService: always install native binaries from .apk
Merge commit '24a03083ca5cf33342debb9a230a591f098f7fd8' into gingerbread

* commit '24a03083ca5cf33342debb9a230a591f098f7fd8':
  PackageManagerService: always install native binaries from .apk
2010-08-18 08:45:35 -07:00
Patrick Scott
243efd2c57 Merge "Use a static variable and methods for the current WebView." 2010-08-18 08:11:38 -07:00
Patrick Scott
8a5d335a55 Use a static variable and methods for the current WebView.
sJavaBridge may not exist by the time onWindowFocusChanged is called.
To avoid an NPE, just static methods that modify a global field.
JWebCoreJavaBridge is a global object anyway so using a static field
will be fine.  To avoid any garbage collection issues, store the
WebView in a WeakReference.

Bug: 2894682
Change-Id: I73de9237ddbbdc55841a9b2639437e26856439c8
2010-08-18 11:00:42 -04:00
Kenny Root
4690627644 Amend previous ndc commit
Submitted wrong patchset. This includes the delta for the latest
patchset.

Change-Id: I63bb9a37dd9100550ae07a3a1c9fdd9fd71724e1
2010-08-18 07:53:30 -07:00
Steve Block
f0f30c677a Implement logic for new Geolocation delayed permission LayoutTests
Bug: 2914450
Change-Id: Ic0be3120e88efe9199f7719b9ccb1090baaabed6
2010-08-18 15:50:48 +01:00
Steve Block
0e4d86fddf Fix naming and executable bits on DumpRenderTree2 scripts
Change-Id: Id1415e2a166289c8c585e132e842f5ca6ad35426
2010-08-18 15:50:46 +01:00
Bjorn Bringert
a006b47298 New API and implementation of DB and memory-backed FDs
This depends on a kernel patch that implements read(2)
in the ashmem driver.

Bug http://b/issue?id=2595601

Change-Id: Ie3b10aa471aada21812b35e63954c1b2f0a7b042
2010-08-18 15:39:52 +01:00
satok
7eb84256e5 Enhancement of method.xml for Fast IME switching
- (Public API) Add public attrs: imeSubtypeExtraValue, imeSubtypeLanguage, imeSubtypeMode
-- (Public API) Add InputMethodSubtype class
-- (Public API) Add getSubtypes to InputMethodInfo
- Add parser for the enhanced method.xml

Change-Id: Ie7965fd29fd9615ef9c9418075c9f5f1c3365eb6
2010-08-18 19:19:00 +09:00
Brian Carlstrom
232a0331c0 tracking merge of external/apache-http from dalvik-dev
Change-Id: I25d7659b25f86f88cb36b4f80589b8c3e3a8c6b2
2010-08-18 00:47:08 -07:00