33950 Commits

Author SHA1 Message Date
Jason Sams
639017920f Merge "Fix object cast." 2010-10-14 17:58:39 -07:00
Jason Sams
9c25aee526 Fix object cast.
Change-Id: Idcf1b43392d43b6b46040b59551b73df6d6e42a9
2010-10-14 17:57:30 -07:00
Jason Sams
c900a79b95 Merge "Async type creation." 2010-10-14 17:52:31 -07:00
Jason Sams
3b9c52ab8c Async type creation.
Change-Id: I4d98446fabbf7e8a98c97f85b573a58c8a0c58c2
2010-10-14 17:48:46 -07:00
Chris Tate
9ba608331e Merge "Drag thumbnail fixes / improvements" 2010-10-14 17:14:07 -07:00
Irfan Sheriff
4910b99d4d Merge "Remove synchronous bluetooth callbacks" 2010-10-14 17:11:13 -07:00
Irfan Sheriff
cdf8edeec2 Remove synchronous bluetooth callbacks
Also, fixed an issue with disabling bluetooth coexistence

Change-Id: Ia7f68dfe6e8d587101ba8513783a0123ff0561a1
2010-10-14 17:06:18 -07:00
Chris Tate
6b3912865c Drag thumbnail fixes / improvements
* Properly wipe the thumbnail canvas before handing it to the app for
  its contents to be drawn

* Provide a getView() method in DragThumbnailBuilder that allows
  clients or subclasses to get at the associated view.  This is
  especially for clients that want to draw entire (sub)layouts as
  the drag thumbnail, by overriding onDrawThumbnail(Canvas c)
  like this:

  // Override specifically for drawing a whole ViewGroup into
  // the drag thumbnail canvas
  @Override
  public void onDrawThumbnail(Canvas c) {
      getView().dispatchDraw(c);
  }

Change-Id: Ib43ddd7cf1d44faf2d7f6ba79f102bc3c7f14596
2010-10-14 16:43:39 -07:00
Adam Cohen
6eb4122c2d Merge "Fixing null pointer exception" 2010-10-14 16:29:29 -07:00
Adam Cohen
6f279627cf Fixing null pointer exception
Change-Id: I902dfc9baa1be7fb07110ccde7a3c0e0049e4417
2010-10-14 16:25:23 -07:00
Adam Powell
302166c0fc Merge "Holo styling and metrics; holo spinners" 2010-10-14 16:24:59 -07:00
Adam Powell
89edde3efa Holo styling and metrics; holo spinners
Change-Id: Ib6d80e5e1a79b7a4ff208df8dbc097e7b9228d13
2010-10-14 16:20:47 -07:00
Jaikumar Ganesh
5b9895c016 Merge "Disconnect PBAP while disconnecting HFP profile." 2010-10-14 16:18:22 -07:00
Jaikumar Ganesh
2beaf7316f Disconnect PBAP while disconnecting HFP profile.
PBAP profile is associated with HFP profile. Disconnect PBAP
profile while disconnecting HFP profile. We ever never doing this
and were expecting the remote end to do it. So when the user
disconnects a headset, we will end up with the ACL link still up
because PBAP has not been disconnected.

This is little bit of a hack till PBAP profile is converted to
use the new profile APIs.

Change-Id: I04821daae6588955fbfea01472e6a1b6f9212608
2010-10-14 16:14:38 -07:00
Jim Miller
66ad9e7207 Merge "Fix 3024528: Add owner info to SecureSettings." 2010-10-14 15:54:21 -07:00
Jim Miller
253a5ef886 Fix 3024528: Add owner info to SecureSettings.
Change-Id: Ibed62aa8881c795f0d48007fc04beac0e9c1d4a0
2010-10-14 15:51:55 -07:00
Justin Ho
6ed0c3ecf3 am dfd37a47: (-s ours) am 45738f67: Merge "Updated GPS on (hdpi and mdpi), text select handles (mdpi), removing unused text_select_handle.png (mdpi)" into gingerbread
Merge commit 'dfd37a4748845273d929f24ae5d68032d19f6216'

* commit 'dfd37a4748845273d929f24ae5d68032d19f6216':
  Updated GPS on (hdpi and mdpi), text select handles (mdpi), removing unused text_select_handle.png (mdpi)
2010-10-14 15:43:25 -07:00
Hung-ying Tyan
379694f528 am 06e55977: am 907f6f1d: Merge "Fix SipSessionGroup from throwing ConcurrentModificationException" into gingerbread
Merge commit '06e559779edd93a83100824b36c9bf67a27db178'

* commit '06e559779edd93a83100824b36c9bf67a27db178':
  Fix SipSessionGroup from throwing ConcurrentModificationException
2010-10-14 15:29:35 -07:00
Adam Powell
45a2033ce9 am 2b87dbc3: (-s ours) am c417612a: Merge "Fix bug 3083631 - Links no longer get tapped during scale gestures" into gingerbread
Merge commit '2b87dbc3b89f19bd5cde58b2b178cb7be50d77f9'

* commit '2b87dbc3b89f19bd5cde58b2b178cb7be50d77f9':
  Fix bug 3083631 - Links no longer get tapped during scale gestures
2010-10-14 15:28:50 -07:00
Chet Haase
3a64f241fe Merge "Remove errant minus sign" 2010-10-14 15:07:30 -07:00
Chet Haase
51b3227c2e Remove errant minus sign
Change-Id: I39a76484884615aa86f4a845eb4637467ec5abc7
2010-10-14 14:59:39 -07:00
Romain Guy
c65217e4ec Merge "Fix text rendering issue." 2010-10-14 14:54:58 -07:00
Shimeng (Simon) Wang
51969178b2 Merge "Remove not-used code." 2010-10-14 14:53:52 -07:00
Shimeng (Simon) Wang
c42f8b8332 Remove not-used code.
issue: 3003933
Change-Id: I3221fb253fe6fbfe9e24368426d7e4a2c1e3502b
2010-10-14 14:52:28 -07:00
Romain Guy
d2a1ff003b Fix text rendering issue.
The local clip rect could be off by one pixel when a 3D transform
was applied to a text primitive. This would cause small rendering
glitches in Launcher in particular.

Change-Id: I1254f6a5838c26810cbe969b096679d40b8dd504
2010-10-14 14:49:34 -07:00
Chris Tate
ba7aad209f Merge "Actually draw the drag thumbnail" 2010-10-14 14:44:06 -07:00
Chris Tate
a32dcf7f72 Actually draw the drag thumbnail
Now sets the layer and thumbnail dimensions correctly.  Also removed the
leftover bits of the now-replaced thumbnail measurement/drawing mechanism.

Fixes bug 3077339

Change-Id: I02983648e0a7ce2ce5fee10825f744e20a3a5b8d
2010-10-14 14:41:07 -07:00
Shimeng (Simon) Wang
7ffe05227e Merge "Fixed viewport enhancement for site with viewport tag." 2010-10-14 14:30:17 -07:00
Chet Haase
fec30790e8 Removed obsolete trace statements
Change-Id: I98041460da3109201b13b00ff553eb3e7290debb
2010-10-14 14:23:30 -07:00
Nicolas Roard
2f55ac0498 Merge "Fix embed webview" 2010-10-14 14:12:40 -07:00
Shimeng (Simon) Wang
afc1c25177 Fixed viewport enhancement for site with viewport tag.
1. Use web content width to calculate overview scale in firstLayout time.
2. Skip pre-calculated viewScale in non-mobile fixed viewport case.

issue: 3003933
Change-Id: Ifdc475d96f5df824912197bf5818f5e649658edf
2010-10-14 14:07:32 -07:00
Nicolas Roard
12c18e691c Fix embed webview
Change-Id: Iac8b3aeb7e5370ce06a3437684e21e8a7fcf7c73
2010-10-14 14:05:17 -07:00
Chet Haase
2794eb3b02 Remove generics from Animator APIs
Change the manner of constructing Animator-related objects from constructors
via generics to factory methods with type-specific method names. Should
improve the proliferation of warnings due to generics issues and make the
code more readable (less irrelevant angle brackets Floating around).

Change-Id: Ib59a7dd72a95d438022e409ddeac48853082b943
2010-10-14 13:13:34 -07:00
Shimeng (Simon) Wang
bf5b247fa1 Merge "Use real fixed viewport, and let the content width be the overview width." 2010-10-14 11:45:52 -07:00
Shimeng (Simon) Wang
6d383aadce Use real fixed viewport, and let the content width be the overview width.
issue: 3003933
Change-Id: I679fe1d5736daf0e8cee746dee53558943796833
2010-10-14 11:16:03 -07:00
Jaikumar Ganesh
0b9ba91fa5 Merge "Add function to check for AVRCP target to send volume keys." 2010-10-14 11:03:42 -07:00
James Dong
271cbb62a5 Merge "Remove hard-coded color format for Nvidia's video encoder" 2010-10-14 11:01:15 -07:00
Romain Guy
83d6e82132 Revert "Remove generics from Animator APIs"
This reverts commit 41f041d9986f8a5d45b6cb0b86e881c81a412168.
2010-10-14 10:13:53 -07:00
Romain Guy
70ea25fa8a Merge "Remove generics from Animator APIs" 2010-10-14 10:08:12 -07:00
Jaikumar Ganesh
c50a67b396 Merge "resolved conflicts for merge of 79a5307a to master" 2010-10-14 09:43:00 -07:00
Jaikumar Ganesh
aa4b235dd7 resolved conflicts for merge of 79a5307a to master
Change-Id: I5a524fe53e74df722db003cec6ab62451fe0f899
2010-10-14 09:39:41 -07:00
Alex Sakhartchouk
838c6a1578 Merge "Changing scenegraph sample to use arrays." 2010-10-14 09:34:56 -07:00
Chet Haase
41f041d998 Remove generics from Animator APIs
Change the manner of constructing Animator-related objects from constructors
via generics to factory methods with type-specific method names. Should
improve the proliferation of warnings due to generics issues and make the
code more readable (less irrelevant angle brackets Floating around).

Change-Id: I7c1776b15f3c9f245c09fb7de6dc005fdba58fe2
2010-10-14 08:39:00 -07:00
Ben Murdoch
4826ce828f Merge "Add support for the complete set of AutoFill profile data." 2010-10-14 07:48:28 -07:00
Steve Block
7864a82b1e Merge "Implement LayoutTestController.overridePreference('WebKitUsesPageCachePreferenceKey')" 2010-10-14 04:46:42 -07:00
Steve Block
5f37cc4308 Implement LayoutTestController.overridePreference('WebKitUsesPageCachePreferenceKey')
This is required for tests that test PageCache behaviour, eg
- fast/dom/DeviceMotion/no-page-cache.html
- fast/dom/DeviceOrientation/no-page-cache.html
- fast/dom/Geolocation/no-page-cache.html

Change-Id: Ie5862f6c86718142c949be81a85358ca6fac628a
2010-10-14 12:43:44 +01:00
Ben Murdoch
cf30872b01 Add support for the complete set of AutoFill profile data.
Change-Id: Iff5b48e732acb16281b9795f1f08b08d24b16cbe
2010-10-14 12:21:43 +01:00
Bjorn Bringert
c9332fa3e9 Delete unused WebView drag tracking code
This also removes android.graphics.utils.BoundaryPatch
which was only used by the Browser for the unused drag
tracking (and by a demo app that I'm also removing).

Change-Id: I48253ae005ab11cb4c70d132bc1ea4f2692e2bd2
2010-10-14 09:39:25 +01:00
Jeff Brown
d3a8f33be1 am 7eb67fb4: am fa3d9557: Merge "Add text selection handles to preloaded drawables." into gingerbread
Merge commit '7eb67fb44098bf4b26a1a2d20516f632ab747805'

* commit '7eb67fb44098bf4b26a1a2d20516f632ab747805':
  Add text selection handles to preloaded drawables.
2010-10-13 23:36:10 -07:00
Andy Stadler
e55fa3b0fe am 8a703c77: am 8e2be267: Add versionCode and versionName to dumpsys packages
Merge commit '8a703c772ef233998fccfbdb159c8879c72fa5d3'

* commit '8a703c772ef233998fccfbdb159c8879c72fa5d3':
  Add versionCode and versionName to dumpsys packages
2010-10-13 23:35:12 -07:00