Commit Graph

28763 Commits

Author SHA1 Message Date
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
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 9bf3bb21c0.
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
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
Steve Block
487300abe1 Merge "Implement logic for new Geolocation delayed permission LayoutTests" 2010-08-18 09:59:33 -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
Jeff Hamilton
6f42edc207 Switch the methods in Browser over to the new provider.
Change-Id: I070db67989cc01b50ef0f64cb8f8652b9a1a587d
2010-08-18 11:12:05 -05: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
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
Adam Powell
2b6a68580b Merge "Fix bug 2927837 - PopupWindows don't account for xlarge status bar height" 2010-08-17 21:26:32 -07:00
Adam Powell
a7287f4d19 Fix bug 2927837 - PopupWindows don't account for xlarge status bar height
Add framework dimension resource screen_margin_bottom. This describes
the bottom margin formed by permanent screen decorations. In xlarge
configs this is equal to the height of the permanent system bar.

PopupWindows now size and position themselves with respect to
screen_margin_bottom.

Change-Id: I8960059adcf09605abf26c228bf877f5632fd11e
2010-08-17 21:17:04 -07:00
Jean-Baptiste Queru
9f115228c8 am 09f67250: resolved conflicts for merge of 0b7bd95d to gingerbread-plus-aosp
Merge commit '09f672509b78344258f1b0d9f021d2ec99942515'

* commit '09f672509b78344258f1b0d9f021d2ec99942515':
  Fix compilation errors in libmedia, libstagefright.
2010-08-17 20:10:30 -07:00
Dianne Hackborn
26095af235 Merge "Maybe fix #2925641: calling onCreateOptionsMenu before attached activity" 2010-08-17 19:52:54 -07:00
Jason Sams
fb545906ad Merge "Make java entry points for native fifo synchronized." 2010-08-17 19:29:17 -07:00
Jason Sams
d78be37d81 Remove OOB object destruction.
Change-Id: Icaa06aca4a701ec663c124d3141d9dbb633d7dc1
2010-08-17 19:28:29 -07:00
Dianne Hackborn
291905e34a Maybe fix #2925641: calling onCreateOptionsMenu before attached activity
Also add some APIs to PreferenceActivity.

Change-Id: I85894a3eb9cd3e5adb78b82e85454c0d74773178
2010-08-17 18:53:19 -07:00
Romain Guy
4ae784f126 Merge "Fix save()/restore() issues in the OpenGL renderer." 2010-08-17 18:40:50 -07:00
Romain Guy
8fb954263d Fix save()/restore() issues in the OpenGL renderer.
The save stack now behaves exactly like in Skia.

Change-Id: If7e642f41f2c8f693f6e8c26cba81507d466562e
2010-08-17 18:40:21 -07:00
Winson Chung
cdff2f2424 Merge "Fixing link in RemoteViewsFactory comment." 2010-08-17 18:17:47 -07:00
Winson Chung
6eceb00db9 Fixing link in RemoteViewsFactory comment.
Change-Id: Ibfb61eedbceb5721e3894074cc4b5597b12691f7
2010-08-17 18:16:47 -07:00