36803 Commits

Author SHA1 Message Date
Eric Laurent
a9639b97f4 Merge "Fix issue 3225810." 2010-11-24 13:08:03 -08:00
Eric Laurent
6dc08b3667 Fix issue 3225810.
Take a wake lock whenever A2DP output stream is active.

Change-Id: Ie50e6d4cb34c8a1ba97b301ef25e10aeb153d8f3
2010-11-24 13:04:01 -08:00
Jaikumar Ganesh
64ad5586c4 Merge "Update BT code for voice capability cases." 2010-11-24 12:44:04 -08:00
Jason Sams
d1479e7d45 Merge "Fix physics bug causing balls to stack." 2010-11-24 12:13:40 -08:00
Jason Sams
c8abdeda28 Fix physics bug causing balls to stack.
Change-Id: I681905cf7499bb92db47ba2a4cca10d0834cf425
2010-11-24 12:12:26 -08:00
Wink Saville
b4f666f1c0 Merge "Promote ActiveApn and methods to DataConnectionTracker." 2010-11-24 11:37:53 -08:00
Wink Saville
dd97d83ff7 Promote ActiveApn and methods to DataConnectionTracker.
Also, add getActiveApnType.

Change-Id: If44d2c35617a1ad385a7e5b7c1028751ded3ead2
2010-11-24 11:28:58 -08:00
Joe Onorato
7750c2ac61 Merge "this should be @hidden" 2010-11-24 11:15:07 -08:00
Joe Onorato
5c0e4a5f47 Merge "Align the battery & data icons correctly." 2010-11-24 11:15:01 -08:00
Joe Onorato
a89e903fd4 this should be @hidden
Change-Id: Ib372fa15a5284b30e2edef5a1d90544eb2166ee4
2010-11-24 11:13:44 -08:00
Andreas Huber
6bdbcd748e Merge "Support streaming data across binder boundaries." 2010-11-24 10:58:46 -08:00
Joe Onorato
ebc8946575 Align the battery & data icons correctly.
Change-Id: I006897306aa70b53f4626d88729c3d7c200b9e22
2010-11-24 10:55:48 -08:00
Jaikumar Ganesh
58b93c3640 Update BT code for voice capability cases.
1. Disable PBAP and Headset / Handsfree records.
2. Add API to query for local adapter UUIDs.

Change-Id: Ic84ba6a49738adc89a8695d3a4890f08562e0621
2010-11-24 10:49:47 -08:00
Dianne Hackborn
a111187a5b Change rotation freeze to all be implemented in window manager.
Lots of work for no visible change in behavior, but now we can
do some fancier stuff...

Also allow rotation in all 4 directions.

Change-Id: I7e5e9537c5e359f69b83c10f65cc1ce95f371461
2010-11-24 10:41:07 -08:00
Joe Onorato
9fb2807e2b Merge "Allow status bar panels to be on top of the status bar." 2010-11-24 10:28:20 -08:00
Joe Onorato
29fc2c9705 Allow status bar panels to be on top of the status bar.
Change-Id: I3c74ece5f7042e6302717f4263746d59d5447ec9
2010-11-24 10:26:50 -08:00
Wink Saville
ac711639ae Merge "Promote ApnSetting to com.android.internal.telephony." 2010-11-24 10:15:56 -08:00
Cary Clark
0931f5d439 Merge "defer resume while selecting text" 2010-11-24 09:47:16 -08:00
Steve Block
f23538c2b5 Merge "Skip LayoutTest http/tests/cookies/third-party-cookie-relaxing.html" 2010-11-24 08:24:44 -08:00
Cary Clark
0df0269832 defer resume while selecting text
Allow scrolling, dragging, zooming to process normally
while selecting text, but prevent them from resuming
the webkit update until the selection is done.

Also, resume the webkit priority when resuming the
updates.

bug:3226364
Change-Id: Idfad6b63b6eb02208f977d89a8409377e9d731e7
2010-11-24 11:01:37 -05:00
Steve Block
a662c8c92c Skip LayoutTest http/tests/cookies/third-party-cookie-relaxing.html
Bug: 3227269
Change-Id: Iae94fe1c8b0ccb52463733c676569c0b9c887963
2010-11-24 14:54:04 +00:00
Bjorn Bringert
93fbae34ce Merge "Don't drop zeros in the second position in formatDuration()" 2010-11-24 03:25:17 -08:00
Wink Saville
176935c605 Promote ApnSetting to com.android.internal.telephony.
Change-Id: I8244331c123ccb33704dd7ae8342327a1a3f7124
2010-11-23 22:59:21 -08:00
Brad Fitzpatrick
4ffb3e097d Merge "Misc ActivityManagerNative cleanup." 2010-11-23 20:09:15 -08:00
satok
c90993f9e4 Merge "Add an API to set InputMethodAndSubtype" 2010-11-23 19:49:35 -08:00
satok
2820351489 Add an API to set InputMethodAndSubtype
Change-Id: I66f1a4c8e0d98705614f12a737e7efcd0263b72a
2010-11-24 12:28:45 +09:00
Brad Fitzpatrick
663f4f33e2 Misc ActivityManagerNative cleanup.
Change-Id: Ib1fba1a72d074a12b44cce64741071815cb680f3
2010-11-23 19:15:24 -08:00
Brad Fitzpatrick
1065685400 Fix potential weird StrictMode NPE.
Seen once in an eng build.  Could in theory happen if there was a
violation in the system server before the activity manager was
registered.

Change-Id: I785f06848af0e2af4657be3a8edbbd658eeb3cf2
2010-11-23 19:01:13 -08:00
Adam Powell
83f5eccb0c Merge "Fix bug 3226108 - WebView would not update content properly after a fling." 2010-11-23 18:11:31 -08:00
Adam Powell
4c3ce84864 Fix bug 3226108 - WebView would not update content properly after a fling.
Change-Id: Ie5d163740ab1b919fef497c06caeb6807db0df52
2010-11-23 18:06:56 -08:00
Brad Fitzpatrick
ab0a3c05fc Merge "Misc Looper cleanups; add android.util.PrefixPrinter" 2010-11-23 17:59:53 -08:00
Vasu Nori
994b0d2b7d Merge "changes to support Change-Id: I572fdfd6d34dbb5a0577c6cf14664b6f2d5700b4" 2010-11-23 17:52:19 -08:00
Fabrice Di Meglio
76b1d4127f Merge "Fix bug #2898737 (add unit tests for SyncOperation.toKey())" 2010-11-23 17:32:52 -08:00
Fabrice Di Meglio
7e118b5ba0 Fix bug #2898737 (add unit tests for SyncOperation.toKey())
Change-Id: I25ae95c9ca67ae5dcb71ff427d976e3e93b48125
2010-11-23 17:31:29 -08:00
Gilles Debunne
af150b5bbd Merge "Long press starts a new selection if one is already started." 2010-11-23 17:29:17 -08:00
Brad Fitzpatrick
1b29825cca Misc Looper cleanups; add android.util.PrefixPrinter
Change-Id: I0b9adce46cb785b4dd4e6296e1f97c8bcf0dbfbf
2010-11-23 17:17:33 -08:00
Gilles Debunne
710a910e73 Long press starts a new selection if one is already started.
Change-Id: Ide525ff0021cf145bb5d2b8db2d09b7b7909289b
2010-11-23 17:09:15 -08:00
Jeff Brown
c97e6f9f35 Merge "Fix build on Linux due to different strrchr prototype." 2010-11-23 16:32:54 -08:00
Jeff Brown
ab841350f9 Fix build on Linux due to different strrchr prototype.
It seems Linux host build has a fancy strrchr overload that preserves
constness.  That's nice but it broke this.

Change-Id: I3c9b57b9ce9abc5d334d1e7b2498a3248bd20a6a
2010-11-23 16:29:54 -08:00
Joe Onorato
1d7ac9699e Merge "new signal strength assets" 2010-11-23 16:21:36 -08:00
Joe Onorato
ec10fa2515 Merge "updated battery assets" 2010-11-23 16:21:29 -08:00
Joe Onorato
5409deac03 Merge "Turn off the long press on home action" 2010-11-23 16:21:22 -08:00
Mike Lockwood
2ed9910d55 Merge changes Ia5fec45a,I74927f73,I5a3c0b07
* changes:
  MTP: Fix typo in MtpServer::doGetObjectPropList
  MTP: Implement GetPartialObject command
  MTP: Use DateTime form in GetObjectPropDesc for date/time properties.
2010-11-23 16:11:29 -08:00
Chet Haase
aa0c8ab00b Merge "Fix hang in native bitmap recycling due to nested mutex locks" 2010-11-23 16:01:49 -08:00
Joe Onorato
ddbba42b81 new signal strength assets
Change-Id: I6387d68659ff7ccf5024f186eeb75ab33c477a1f
2010-11-23 15:54:44 -08:00
Joe Onorato
8db70edf34 updated battery assets
Change-Id: I1a7a00c038041031daee59fb63bd5271da276619
2010-11-23 15:54:44 -08:00
Joe Onorato
46b0d6861c Turn off the long press on home action
Change-Id: I8b083e9e9b8bde4751264de18e5400434b315848
2010-11-23 15:54:43 -08:00
Jeff Brown
42e514b0d1 Merge "Port Emulator keymaps." 2010-11-23 15:51:27 -08:00
Mike Lockwood
e3634c3a80 MTP: Fix typo in MtpServer::doGetObjectPropList
Change-Id: Ia5fec45a238c49a6797a4ac55457ddb5d6521408
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-11-23 18:45:25 -05:00
Mike Lockwood
44e82ddaec MTP: Implement GetPartialObject command
Allows host to read partial contents of files on the device

Change-Id: I74927f7394224d674e1d150a4b72a51d9358459b
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-11-23 18:45:01 -05:00