James Dong
6ca23a624c
am d24d00ae: am f9e7442a: Update sample code in documentation
...
* commit 'd24d00ae1c0eaa20ec9f8581be4baba723ea4a00':
Update sample code in documentation
2011-02-11 12:00:14 -08:00
James Dong
d24d00ae1c
am f9e7442a: Update sample code in documentation
...
* commit 'f9e7442a0c0c7efc70d13fa9330baa797316154a':
Update sample code in documentation
2011-02-11 11:56:33 -08:00
Robert Greenwalt
614613e2d2
Merge "Update LinkProperties treatment of gateways"
2011-02-11 11:38:44 -08:00
Santosh Madhava
9ee9aad809
Fix for issue 3444358 : Movie studio is broken in Master-TOT
...
Change-Id: Ie83703a5da6587a6b5668bc4777fdba71042b2bc
2011-02-11 11:34:26 -08:00
Robert Greenwalt
992564e481
Update LinkProperties treatment of gateways
...
A link can have multiple gateways (think ipv4/ipv6 for a trivial example).
.
bug:3438810
Change-Id: I28c90a6947cd50b82e5ca9a0113148f98b3f4dd8
2011-02-11 11:06:23 -08:00
Dheeraj Sharma
1d830165a0
Merge "Fix for issue : 3439708 Last frame is missing effect"
2011-02-11 10:57:31 -08:00
Amith Yamasani
cfd2eb0f2e
Merge "Fix over-eager locking of volume dialog's primary stream."
2011-02-11 10:42:56 -08:00
Jean-Baptiste Queru
da083c3b15
am 0ba97e3f: am 6d104f11: (-s ours) am 6901f963: am 93552de8: Merge "stubs"
...
* commit '0ba97e3ff830e3f6045650e0a4bd0d08dad50fcc':
stubs
2011-02-11 10:33:58 -08:00
Jean-Baptiste Queru
0ba97e3ff8
am 6d104f11: (-s ours) am 6901f963: am 93552de8: Merge "stubs"
...
* commit '6d104f118a59e276eb577ae322f29c2ff8a5015a':
stubs
2011-02-11 10:16:45 -08:00
Jean-Baptiste Queru
6d104f118a
am 6901f963: am 93552de8: Merge "stubs"
...
* commit '6901f963c27f2d0a9caf56b42b6054d0cecc84d1':
stubs
2011-02-11 10:04:53 -08:00
Leon Scroggins
2b24957d67
Merge "Do not show the dropdown unless there is something to show."
2011-02-11 09:58:05 -08:00
Jean-Baptiste Queru
6901f963c2
am 93552de8: Merge "stubs"
...
* commit '93552de8e305027fb003401e347b9493c64c981f':
stubs
2011-02-11 09:54:59 -08:00
Jean-Baptiste Queru
93552de8e3
Merge "stubs"
2011-02-11 09:39:46 -08:00
Steve Block
1da970625c
stubs
...
Change-Id: I6bc0b8e9d4412a0b60c6226fbd2b7a6d15aceb22
2011-02-11 09:33:40 -08:00
Leon Scroggins
03e0119c93
Do not show the dropdown unless there is something to show.
...
Bug:3427152
Change-Id: I2f0c36193f762085c2e1e7036387ff04f6f259d0
2011-02-11 10:19:22 -05:00
Mike Lockwood
540380fb0a
Add MTP/PTP host support to the public API
...
Needed for unbundling the Gallery app
Change-Id: I57e6b76ee5c9e57cb8c055329ac13251879baafd
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-02-11 09:09:11 -05:00
Mike Lockwood
bc20c93863
Merge "MTP: Fix JNI warnings in MtpDevice"
2011-02-11 05:21:26 -08:00
Mike Lockwood
40304e2272
MTP: Fix JNI warnings in MtpDevice
...
Needed to add a global ref to the classse to avoid
"not a valid JNI reference" errors when calling the constructor.
Change-Id: Ieb7e69f5d19fd5a090c53d32f69a201040c49112
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-02-11 08:19:11 -05:00
Chih-Chung Chang
d4c5b7651f
Merge "Fix a bug that the condition for play/pause was reversed."
2011-02-10 19:23:52 -08:00
Jesse Wilson
c2c9a2492c
Don't add setMaxSize() to the LruCache API. But do add maxSize().
...
Change-Id: I9697ab29491dabe85c2400defdde16b9abcd003a
2011-02-10 19:20:31 -08:00
James Dong
f9e7442a0c
Update sample code in documentation
...
bug - 3364497
Change-Id: I4cad247a403917aa7816350454c9ae3930dd3d25
2011-02-10 18:48:31 -08:00
Jesse Wilson
b1d884d589
Merge "Adopt LRU cache in SQLite."
2011-02-10 18:28:44 -08:00
Jesse Wilson
9b5a93550f
Adopt LRU cache in SQLite.
...
Change-Id: I6b43dd8843d41726254bea3a175fe28f5f061ed7
http://b/3184897
2011-02-10 18:26:39 -08:00
Adam Powell
76164d6d45
Merge "Fix bug 2955651 - can open normal menu during action modes"
2011-02-10 18:25:06 -08:00
Amith Yamasani
e3361b8d08
Fix over-eager locking of volume dialog's primary stream.
...
Bug: 3427027
Don't lock in the active stream if visual feedback was not requested.
This fixes a transient problem after the notification volume was modified
by an API call.
Change-Id: I2227d8fdf6cc565713d9bbcc66748805e04ae163
2011-02-10 18:20:50 -08:00
Dheeraj Sharma
fb4e92c4ed
Fix for issue : 3439708 Last frame is missing effect
...
Change-Id: Ibfc81c06ec525e95e5733bf03b7a2f3b58a5574c
2011-02-10 18:05:20 -08:00
Vasu Nori
ba44110117
Merge "bug:3425749 send notification for completed download"
2011-02-10 17:58:36 -08:00
Adam Powell
ef5a440d0a
Fix bug 2955651 - can open normal menu during action modes
...
Prevent the usual menu pipeline from trying to open the action bar
overflow menu when the action bar is not visible.
Change-Id: I0708d142ad271368baa79351b97aad1533636fe7
2011-02-10 17:57:48 -08:00
Vasu Nori
f9e8523e62
bug:3425749 send notification for completed download
...
Change-Id: Ib46df5eaa9316fe0fc843fee1e4597e22768f4a8
2011-02-10 16:54:03 -08:00
Romain Guy
eefdd709dd
Merge "Dirty layers in the area covered by a drawBitmapMesh() call Bug #3410827 "
2011-02-10 15:50:16 -08:00
Romain Guy
b18d2d0079
Dirty layers in the area covered by a drawBitmapMesh() call
...
Bug #3410827
Change-Id: Ic8b4f6201af94497bba86c75819588c78debddc2
2011-02-10 15:52:54 -08:00
Jesse Wilson
da350fb685
Merge "Adopt LruCache in WifiStateMachine."
2011-02-10 15:48:17 -08:00
Jason Sams
a03837b6ee
am e8d074d7: am cbcd9335: Merge "Basic 101 level compute example for RS." into honeycomb
...
* commit 'e8d074d763f1c9551c41654589597e45476d27e0':
Basic 101 level compute example for RS.
2011-02-10 15:46:21 -08:00
Mathias Agopian
a11faf889e
am c6c3e77d: am b66b7a2c: Merge "fix [3408713] Dialog window invisible sometimes" into honeycomb
...
* commit 'c6c3e77d4d5cd8de3b1a56bdffdfd42774849512':
fix [3408713] Dialog window invisible sometimes
2011-02-10 15:46:15 -08:00
Dirk Dougherty
36305fc416
am 592989b3: am 12244c57: Merge "Doc change: changes for 3.0 SDK" into honeycomb
...
* commit '592989b3b7c088114de6ee59d609449de749fd78':
Doc change: changes for 3.0 SDK
2011-02-10 15:46:10 -08:00
Robert Ly
272fc4547b
am affeaaed: am bbdc4ce2: Merge "clean up and add javadocs" into honeycomb
...
* commit 'affeaaed8ef0776455fbecbf70627df3dd842030':
clean up and add javadocs
2011-02-10 15:46:06 -08:00
Alex Sakhartchouk
cc3b7cd293
am bf3aae10: am efc48eea: Merge "HelloWorld graphics sample for Renderscript." into honeycomb
...
* commit 'bf3aae10b5fa73cced245276f3b2f433c9cd635e':
HelloWorld graphics sample for Renderscript.
2011-02-10 15:46:01 -08:00
Alex Sakhartchouk
f2270583fd
am 7541a9a2: am f1ff8b2f: Merge "Cleanup of the code in view to do creation/destruction in the right places." into honeycomb
...
* commit '7541a9a25036410f17718d86fe57ea33c0f789d3':
Cleanup of the code in view to do creation/destruction in the right places.
2011-02-10 15:45:57 -08:00
Glenn Kasten
8132a8caf3
Merge "Bug 3352047 Wrong message when adjusting volume"
2011-02-10 15:27:59 -08:00
Jason Sams
e8d074d763
am cbcd9335: Merge "Basic 101 level compute example for RS." into honeycomb
...
* commit 'cbcd93352b9fff3ada4a01c3094b24e5fafde97f':
Basic 101 level compute example for RS.
2011-02-10 15:08:41 -08:00
Mathias Agopian
c6c3e77d4d
am b66b7a2c: Merge "fix [3408713] Dialog window invisible sometimes" into honeycomb
...
* commit 'b66b7a2c183a1423ea629d4f73ed95f9b87d54b7':
fix [3408713] Dialog window invisible sometimes
2011-02-10 15:08:33 -08:00
Dirk Dougherty
592989b3b7
am 12244c57: Merge "Doc change: changes for 3.0 SDK" into honeycomb
...
* commit '12244c57960d85a066c94774e3e37685d0081213':
Doc change: changes for 3.0 SDK
2011-02-10 15:08:28 -08:00
Robert Ly
affeaaed8e
am bbdc4ce2: Merge "clean up and add javadocs" into honeycomb
...
* commit 'bbdc4ce254e4918f771e448cd4fa9602679eaf2b':
clean up and add javadocs
2011-02-10 15:08:18 -08:00
Alex Sakhartchouk
bf3aae10b5
am efc48eea: Merge "HelloWorld graphics sample for Renderscript." into honeycomb
...
* commit 'efc48eea1541990046248b86e899c72b58c8506f':
HelloWorld graphics sample for Renderscript.
2011-02-10 15:08:14 -08:00
Alex Sakhartchouk
7541a9a250
am f1ff8b2f: Merge "Cleanup of the code in view to do creation/destruction in the right places." into honeycomb
...
* commit 'f1ff8b2fd6441d122e84c5040834bf6e0d845b05':
Cleanup of the code in view to do creation/destruction in the right places.
2011-02-10 15:07:59 -08:00
Adam Powell
1f0135cb70
Merge "Fix bug 3372468 - ActionBar menu shouldn't be clickable after ActionBar.hide() is called"
2011-02-10 15:07:09 -08:00
Shimeng (Simon) Wang
a22a011fab
Merge "Don't send scroll events in case of new picture from webkit."
2011-02-10 15:07:07 -08:00
Adam Powell
01feaee3d9
Fix bug 3372468 - ActionBar menu shouldn't be clickable after
...
ActionBar.hide() is called
Action bar will capture touch events and prevent focus from passing to
its children while animating out.
Change-Id: I4501f785ead2afa34f020f9bc1a1121932f3c047
2011-02-10 15:05:05 -08:00
Jean-Baptiste Queru
5381b467d5
am fe9b24f4: Ignore a8d3f02a from honeycomb - already there
...
* commit 'fe9b24f4cd665573c2dc0ced444ecc4997ece1a1':
DO NOT MERGE
2011-02-10 15:04:20 -08:00
Huahui Wu
36d2823e57
Merge "b/3416864 Send the cert info from Native to Java side."
2011-02-10 15:00:23 -08:00