Scott Main
01ecdcc756
am b9d7873c: am a602972c: am 1acd2a7f: Merge "docs: add Lenevo driver info" into honeycomb-mr2
...
* commit 'b9d7873cecdc6052ed4004293ead2071db7fb24c':
docs: add Lenevo driver info
2011-06-24 17:15:53 -07:00
Jeff Sharkey
a0ac98bd5c
Finish any enter animation when jumping to state.
...
When jumpDrawablesToCurrentState(), finish any alpha animation in
progress. Fixes bug where drawable with enter fade would remain
transparent until next state change.
Change-Id: Ia087f935566a8d78e0efdcb0a1a2f791db05c70e
2011-06-24 17:08:12 -07:00
Tsu Chiang Chuang
b40ec927bb
Merge "adding notification stress tests."
2011-06-24 16:55:36 -07:00
Andy McFadden
c820145eca
Reduce definition of monthly rep test
...
The repeatsMonthlyOnDayCount() function was returning true for events
like FREQ=MONTHLY;BYDAY=TU which actually appear weekly. This is not
the desired behavior of the function.
Bug 4522027
Change-Id: I03ef68b429828097c8bad7fcd374e7c9eb4c7b03
2011-06-24 16:53:55 -07:00
Robert Greenwalt
554475f09c
Merge "resolved conflicts for merge of 40717996 to master"
2011-06-24 16:39:08 -07:00
Dianne Hackborn
2d6833bab3
Turn on HW accel by default for apps that target ICS.
...
Change-Id: I010e11e03b2dfd0d1db8c47f74c25a28586fd79c
2011-06-24 16:25:59 -07:00
Tsu Chiang Chuang
a760e55783
adding notification stress tests.
...
Change-Id: Ideaae33843685fcbec4c4f38bf9c2ced97c9bf86
2011-06-24 16:19:37 -07:00
Robert Greenwalt
86994c1fc1
resolved conflicts for merge of 40717996 to master
...
Change-Id: Ie5c0f1f20c313d6c568b3b06f778f75223914ada
2011-06-24 16:10:06 -07:00
Isaac Levy
bc7dfb58bf
WifiWatchdogService - disable bad connections
...
Complete rewrite of WifiWatchdogService.java. Checking for connectivity and managing wifi upon failure detection.
Change-Id: Ifcb8b5d7e0112cbc2f2282d76fdc93ea15527a44
2011-06-24 15:48:10 -07:00
Dianne Hackborn
7cec14235d
Merge "Small cleanup of am/pm commands."
2011-06-24 15:22:22 -07:00
Christopher Tate
78a7f12043
Merge "Fix settings restore"
2011-06-24 15:15:51 -07:00
Christopher Tate
28cdb9e104
Fix settings restore
...
Also correct the debug-mode logging of error locations in backup data.
Bug 4914182
Change-Id: Ie7dda0192afa819e42490b7ffd2d3db6f11968f6
2011-06-24 15:06:48 -07:00
Mike J. Chen
f59c7d0f2a
Hookup interface status to other clients
...
After unreverting the linkstate change patch, hook up notification handlers
that didn't exist when the first patch was created, like
EthernetDataTracker.java and Vpn.java.
For the observers that handle interfaceStatusChanged(), I made
interfaceLinkStatusChanged() call it so they both do the same thing.
Change-Id: I0077e5e5f48f3932ba98f5bf363243892f2de6cc
Signed-off-by: Mike J. Chen <mjchen@google.com>
2011-06-24 15:02:30 -07:00
Romain Guy
c1ba416af5
Merge "Reduce the number of UI events required to update a SurfaceTexture."
2011-06-24 14:56:20 -07:00
Romain Guy
58f4edb770
Reduce the number of UI events required to update a SurfaceTexture.
...
Change-Id: I9330c9646654fff57dcd6817c86e587a6490a9ad
2011-06-24 14:55:55 -07:00
Dave Santoro
cb2bb4f70f
Renamed INCLUDE_PROFILE param to ALLOW_PROFILE.
...
Also clarified comments to indicate that this is only intended to be used
in list queries.
Bug: 4777097
Change-Id: I3c3e08d796755e2613a94a1e9b6dc2961f4483a3
2011-06-24 14:45:53 -07:00
Jesse Wilson
9bc0521e2b
Merge "Test that algorithm name is case-insensitive for digest auth."
2011-06-24 14:33:46 -07:00
Jesse Wilson
df867f8f80
Test that algorithm name is case-insensitive for digest auth.
...
Change-Id: I891a533ae3b16b838925fa488093c19dfeb32efa
http://code.google.com/p/android/issues/detail?id=16051
2011-06-24 13:50:37 -07:00
Dianne Hackborn
46d110329e
Small cleanup of am/pm commands.
...
Change-Id: I5af730bc177635821a82d4dd3ec9130a5dcd525a
2011-06-24 13:22:45 -07:00
Romain Guy
c897fbfaf9
Merge "Code cleanup"
2011-06-24 13:21:30 -07:00
Romain Guy
02ccac69fd
Code cleanup
...
Change-Id: I64c346004e0adf9a776d0315534d4fe445f0c0ca
2011-06-24 13:20:23 -07:00
Dianne Hackborn
06ca9b90e6
am fa5e3b65: am 2dafe771: Merge "DO NOT MERGE. Fix density compat mode." into honeycomb-mr2
...
* commit 'fa5e3b658f3f42eabec82c9f8e44d8a4cc565249':
DO NOT MERGE. Fix density compat mode.
2011-06-24 12:43:44 -07:00
Daisuke Miyakawa
b81b1c91d8
Merge "Uppercase region code so that AsYouTypeFormatter works correctly."
2011-06-24 12:32:04 -07:00
Dianne Hackborn
fa5e3b658f
am 2dafe771: Merge "DO NOT MERGE. Fix density compat mode." into honeycomb-mr2
...
* commit '2dafe771bb7ad4b15db6b740fd3ccb8f0fae836d':
DO NOT MERGE. Fix density compat mode.
2011-06-24 12:26:17 -07:00
Fabrice Di Meglio
a54a600bc4
Merge "Fix bug #4813026 resolved direction of view doesn't change after layout direction changes"
2011-06-24 12:21:28 -07:00
Jean-Baptiste Queru
ec5039b372
am 99c070d8: am 4fea5373: Merge "Add WEBP to the list of Image formats that support Compression."
...
* commit '99c070d8eb9f1ff9ea5c38991f15f091040226c2':
Add WEBP to the list of Image formats that support Compression.
2011-06-24 12:20:24 -07:00
Jean-Baptiste Queru
9f1ef6d57b
am 7595e84d: (-s ours) am f458d5fd: Merge "Tweak for forward-compatibility"
...
* commit '7595e84d3a60d2a63990703043a8e9647f71e3a4':
Tweak for forward-compatibility
2011-06-24 12:20:10 -07:00
Dianne Hackborn
2dafe771bb
Merge "DO NOT MERGE. Fix density compat mode." into honeycomb-mr2
2011-06-24 12:13:16 -07:00
Fabrice Di Meglio
d3d4b4b86a
Merge "Fix potential advances overrun in TextLayoutCache."
2011-06-24 12:02:58 -07:00
Doug Felt
b092f55c37
Fix potential advances overrun in TextLayoutCache.
...
Change-Id: Ibec544f249833a28fe8ef9a15fc8ab48fddfc51c
2011-06-24 11:54:00 -07:00
John Reck
f4db8d566c
Merge "Don't resend WEBKIT_DRAW if paused"
2011-06-24 11:36:10 -07:00
Jaikumar Ganesh
c9286ebbf4
Merge "Implement APIs for Bluetooth Health profile."
2011-06-24 11:34:35 -07:00
Jean-Baptiste Queru
99c070d8eb
am 4fea5373: Merge "Add WEBP to the list of Image formats that support Compression."
...
* commit '4fea5373d350f5d855408ffaa41206b8fa743c55':
Add WEBP to the list of Image formats that support Compression.
2011-06-24 11:33:46 -07:00
Jaikumar Ganesh
2ea1e85dcb
Implement APIs for Bluetooth Health profile.
...
This first patch implements all the APIs.
The APIs wil be made public soon. The data specification
API will be submited in another patchset.
Change-Id: I2462683b7e07380e2c42474b0036b34d03b4bed1
2011-06-24 11:31:43 -07:00
Jean-Baptiste Queru
7595e84d3a
am f458d5fd: Merge "Tweak for forward-compatibility"
...
* commit 'f458d5fdb8a48747d6fdd5fd0d0a44a6a8ed89e9':
Tweak for forward-compatibility
2011-06-24 11:28:30 -07:00
Jean-Baptiste Queru
4fea5373d3
Merge "Add WEBP to the list of Image formats that support Compression."
2011-06-24 11:13:42 -07:00
Jean-Baptiste Queru
f458d5fdb8
Merge "Tweak for forward-compatibility"
2011-06-24 11:08:36 -07:00
John Reck
1c1e6df04a
Don't resend WEBKIT_DRAW if paused
...
Bug: 4606210
If a WEBKIT_DRAW message came in after the WebView was paused,
it would fail to draw causing it to re-send the WEBKIT_DRAW message
which would lead to an infinite loop until the WebView is resumed.
Fix this by not re-sending the WEBKIT_DRAW message if webview is paused.
Change-Id: I3dd946e4e948cf3fd6af07ba6f7fdac2f967a631
2011-06-24 11:07:09 -07:00
Amith Yamasani
b0b1b11b96
Merge "SearchView improvements per design."
2011-06-24 10:58:38 -07:00
Jean-Baptiste Queru
0fe0e7a4cb
Tweak for forward-compatibility
...
Change-Id: Ic5e4d949c1c80a2ebdc2ec802c35b5d3d7f9661d
2011-06-24 10:49:18 -07:00
Jaikumar Ganesh
e0ac113b47
Merge "Fix excessive locking synchronization leading to deadlocks."
2011-06-24 09:28:02 -07:00
The Android Open Source Project
a6bdb4c771
Reconcile with gingerbread-release
...
Change-Id: Ic4aca5ef26cbfb97281582ddb6bfe290f60c29fc
2011-06-24 08:08:41 -07:00
Shaopeng Jia
5b0b167f7f
Uppercase region code so that AsYouTypeFormatter works correctly.
...
Change-Id: Iaf46ec5241a1a8984753bd6d8f9f842884efaa15
2011-06-24 13:50:43 +02:00
Anirudh Dewani
9b375068ac
Typo in spinner tutorial.
...
Change-Id: I2bacd7b417c21944703738cd410dc1ec67c1b554
2011-06-24 16:30:20 +05:30
Hung-ying Tyan
808be0d064
Merge "Restart NAT port timeout measurement when keepalive fails and other fixes"
2011-06-24 01:37:53 -07:00
Hung-ying Tyan
2c13dd7755
Merge "Execute all the due wakeup events in SipWakeupTimer."
2011-06-24 01:37:33 -07:00
Hung-ying Tyan
e65f3a896f
Restart NAT port timeout measurement when keepalive fails and other fixes
...
Misc keepalive fixes including:
+ Restart NAT port timeout measurement when keepalive fails. The max interval
is set to the current keepalive interval.
+ When exception occurs during sending a keepalive, restarts registration.
+ When exception occurs during measurement, retry for a limited times before
giving up.
Change-Id: I7aa787a5ec7c4c9b4334aa1017371d9049b3520c
2011-06-24 15:28:15 +08:00
Grace Kloba
5c5050d902
Make TextureView to use async SurfaceTexture.
...
With this, there is no synchronous destroy SurfaceTexture requirement any more.
Revert the previous change which only applies to the sync SurfaceTexture.
Change-Id: Id4790d38a27f2982d0c8ad471bc1107683d27ffc
2011-06-23 22:32:04 -07:00
Mathias Agopian
138f33bcef
Merge "Add allowSynchronousMode to SurfaceTexture constructor."
2011-06-23 21:31:33 -07:00
Grace Kloba
0904d0af81
Add allowSynchronousMode to SurfaceTexture constructor.
...
Change-Id: I54f30a3c16bbe6b813f3bcd1d389da5627531304
2011-06-23 21:21:47 -07:00