34176 Commits

Author SHA1 Message Date
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
Jesse Wilson
9bb8e5cc3e am 8f666c2d: Merge "Test that we don\'t leak sensitive information when logging cookies." into gingerbread
Merge commit '8f666c2db1811b2f1797a692d6547362f3cd9954' into gingerbread-plus-aosp

* commit '8f666c2db1811b2f1797a692d6547362f3cd9954':
  Test that we don't leak sensitive information when logging cookies.
2010-10-14 16:02:57 -07:00
Jesse Wilson
8f666c2db1 Merge "Test that we don't leak sensitive information when logging cookies." into gingerbread 2010-10-14 15:57:59 -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
Mathias Agopian
dfa08fbfd8 [3095807] screen takes a long time to turn on
turn on animation is now ~200 ms (12 frames).

Change-Id: I49ca9e8d0afa566349d360b3b6c88f0d55aa6e75
2010-10-14 15:39:21 -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
Jesse Wilson
2102bde9d4 Test that we don't leak sensitive information when logging cookies.
Change-Id: I048a785fa7209841ff1bffc365ed5e1bceb53522
http://b/3095990
2010-10-14 15:18:45 -07:00
Mathias Agopian
7e9a54d460 am d4e03f37: addresses parts of 3096779 and 3097475
Merge commit 'd4e03f37423bee383d17f7292753a5f67e497a28' into gingerbread-plus-aosp

* commit 'd4e03f37423bee383d17f7292753a5f67e497a28':
  addresses parts of 3096779 and 3097475
2010-10-14 15:17:16 -07:00
Chet Haase
3a64f241fe Merge "Remove errant minus sign" 2010-10-14 15:07:30 -07:00
Mathias Agopian
a8faf91fa5 am 6d71f6a0: Merge "fix [3095607] Gingerbread screen turn-on animation does not show the last frame" into gingerbread
Merge commit '6d71f6a0ae9fd81ce25562aee67f841b5d8394cf' into gingerbread-plus-aosp

* commit '6d71f6a0ae9fd81ce25562aee67f841b5d8394cf':
  fix [3095607] Gingerbread screen turn-on animation does not show the last frame
2010-10-14 15:01:23 -07:00
Chet Haase
51b3227c2e Remove errant minus sign
Change-Id: I39a76484884615aa86f4a845eb4637467ec5abc7
2010-10-14 14:59:39 -07:00
Mathias Agopian
d4e03f3742 addresses parts of 3096779 and 3097475
3097475: Animation setting should control the screen on animation
3096779: CRT power-on animation can briefly show the top app instead of lockscreen

There is now a parameter that controls wether the ON and/or OFF animation are
performed. we also always clear the screen to black on power off, to make
sure it won't briefly appear on power on.
HOWEVER, 3096779 is not 100% fixed in the case where we're doing the animation
because there is a race, where SF doesn't wait (b/c it doesn't know) for the
framework to have redrawn the lockscreen.

Change-Id: Ie0f02c9225fcdf24b1e8907e268eb7da2c5b0a03
2010-10-14 14:57:34 -07:00
Romain Guy
c65217e4ec Merge "Fix text rendering issue." 2010-10-14 14:54:58 -07:00
Mathias Agopian
6d71f6a0ae Merge "fix [3095607] Gingerbread screen turn-on animation does not show the last frame" into gingerbread 2010-10-14 14:53:55 -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
Kenny Root
b7f8032a7e am 229309e5: Merge "Import revised translations" into gingerbread
Merge commit '229309e582dfdd63c1ce903c73b63bcd74c75567' into gingerbread-plus-aosp

* commit '229309e582dfdd63c1ce903c73b63bcd74c75567':
  Import revised translations
2010-10-14 14:30:41 -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
Kenny Root
229309e582 Merge "Import revised translations" into gingerbread 2010-10-14 14:17:57 -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
Raphael Moll
729503c280 am 848a2bc4: Merge "MinGW/Cygwin requires open() in O_BINARY mode." into gingerbread
Merge commit '848a2bc4cc6eab0f1d0bc030616b9305df3aa7da' into gingerbread-plus-aosp

* commit '848a2bc4cc6eab0f1d0bc030616b9305df3aa7da':
  MinGW/Cygwin requires open() in O_BINARY mode.
2010-10-14 13:41:51 -07:00
Mathias Agopian
3d4a9774ce am b0e020ab: Merge "may fix 3097381 and 3097482. don\'t abort on/off if the animation fails" into gingerbread
Merge commit 'b0e020ab409b725a556f2c5043b08c9bac2c29bf' into gingerbread-plus-aosp

* commit 'b0e020ab409b725a556f2c5043b08c9bac2c29bf':
  may fix 3097381 and 3097482. don't abort on/off if the animation fails
2010-10-14 13:41:28 -07:00
Jaikumar Ganesh
096a1e6c83 am 8b525c07: Merge "Check for state before disconnecting." into gingerbread
Merge commit '8b525c076068eb38106dca05513816c01d8bdddb' into gingerbread-plus-aosp

* commit '8b525c076068eb38106dca05513816c01d8bdddb':
  Check for state before disconnecting.
2010-10-14 13:41:16 -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
Raphael Moll
848a2bc4cc Merge "MinGW/Cygwin requires open() in O_BINARY mode." into gingerbread 2010-10-14 13:01:17 -07:00
Mathias Agopian
8b6a0545ad fix [3095607] Gingerbread screen turn-on animation does not show the last frame
always redraw the screen entirely after the power-on animation, because:
- the animation may not run (ie: on the emu)
- the animation may not contain the video planes
- the interpolation may not be perfect and not land exactly on the last frame

Change-Id: I9ba40f537b1e94464f8a3ed6f81e7c2f552df51d
2010-10-14 12:46:24 -07:00
Mathias Agopian
b0e020ab40 Merge "may fix 3097381 and 3097482. don't abort on/off if the animation fails" into gingerbread 2010-10-14 12:38:51 -07:00
Jaikumar Ganesh
8b525c0760 Merge "Check for state before disconnecting." into gingerbread 2010-10-14 12:36:00 -07:00
Jaikumar Ganesh
5844f1d357 Check for state before disconnecting.
This is a race condition exposed after we turned off some STOPSHIP
logging and some other logging. We drop the ACl connection after 2 secs
of inactivity and hence the device didn't exist -> DBUS crash.

Bug: 3097224
Change-Id: I90adbbee2c5793924037685e484027ed5cd2e0d0
2010-10-14 12:33:16 -07:00
Mathias Agopian
a6cd6d3104 may fix 3097381 and 3097482. don't abort on/off if the animation fails
now that sf handles more of the screen on/off state, we don't want to abort
because/if the animation fails for some reason (which will be the case on the
emulator).

Change-Id: I239e0a39cf8aff3074647e82db92de4a0bf0e494
2010-10-14 12:24:54 -07:00
Joe Malin
439444d904 am 75d3591b: Merge "DOC CHANGE: Fix bug in Testing doc" into gingerbread
Merge commit '75d3591b2dd60e50182542045147b9b6033c2b85' into gingerbread-plus-aosp

* commit '75d3591b2dd60e50182542045147b9b6033c2b85':
  DOC CHANGE: Fix bug in Testing doc
2010-10-14 12:09:33 -07:00
Joe Malin
75d3591b2d Merge "DOC CHANGE: Fix bug in Testing doc" into gingerbread 2010-10-14 12:05:33 -07:00
Jeff Brown
567db07702 am 2d441e14: Merge "Make sure EventHub reports added/removed devices immediately." into gingerbread
Merge commit '2d441e148502bb492816ef84837510397f77a039' into gingerbread-plus-aosp

* commit '2d441e148502bb492816ef84837510397f77a039':
  Make sure EventHub reports added/removed devices immediately.
2010-10-14 12:03:36 -07:00
Roy West
d23cc4b814 am 29f28cdc: Merge "Change storage names to match 10-13 decision" into gingerbread
Merge commit '29f28cdc5315d11919595bf8623d6a67797a34e7' into gingerbread-plus-aosp

* commit '29f28cdc5315d11919595bf8623d6a67797a34e7':
  Change storage names to match 10-13 decision
2010-10-14 12:03:19 -07:00
Joe Onorato
35d34c67b7 am 3d828e62: Merge "Do not build pbkdf2gen on non-Linux hosts" into gingerbread
Merge commit '3d828e62c856074334a00ce7c621050b4d7166e4' into gingerbread-plus-aosp

* commit '3d828e62c856074334a00ce7c621050b4d7166e4':
  Do not build pbkdf2gen on non-Linux hosts
2010-10-14 12:03:07 -07:00
Gilles Debunne
4fa7f4f496 am 53ea7f58: Merge "Really leave text selection mode when using the trackball." into gingerbread
Merge commit '53ea7f58c071563b7c5dd0061df39d3b4bf38a63' into gingerbread-plus-aosp

* commit '53ea7f58c071563b7c5dd0061df39d3b4bf38a63':
  Really leave text selection mode when using the trackball.
2010-10-14 12:02:44 -07:00
Jeff Brown
2d441e1485 Merge "Make sure EventHub reports added/removed devices immediately." into gingerbread 2010-10-14 11:52:58 -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
Roy West
29f28cdc53 Merge "Change storage names to match 10-13 decision" into gingerbread 2010-10-14 11:15:50 -07:00