Chris Craik
94b97b38b7
am eab51de4: Merge "Fix clipping and stencil layer issues"
...
* commit 'eab51de4de88219256260fe26e2018a6234ef83b':
Fix clipping and stencil layer issues
2013-02-21 19:31:17 -08:00
Chris Craik
eab51de4de
Merge "Fix clipping and stencil layer issues"
2013-02-22 03:28:06 +00:00
Kenny Root
4e89d1a9b2
am 893df066: am 8dda0956: am 49999acb: Merge "StreamingZipInflater: fix mmap\'d end of read"
...
* commit '893df066bbd156b05171e68204a407a212c507e9':
StreamingZipInflater: fix mmap'd end of read
2013-02-21 16:28:14 -08:00
Kenny Root
893df066bb
am 8dda0956: am 49999acb: Merge "StreamingZipInflater: fix mmap\'d end of read"
...
* commit '8dda0956b6565a958989af44e885b94dc9bfc9bd':
StreamingZipInflater: fix mmap'd end of read
2013-02-21 16:24:41 -08:00
Kenny Root
8dda0956b6
am 49999acb: Merge "StreamingZipInflater: fix mmap\'d end of read"
...
* commit '49999acb049e09f99135e412cbb10d7367d2d607':
StreamingZipInflater: fix mmap'd end of read
2013-02-21 16:21:05 -08:00
Chris Craik
b98a016c67
Fix clipping and stencil layer issues
...
bug:8235699
Ensure rectangle clipping operations disable deferring when necessary
(i.e., when the op might create a non-rect region), including in
DisplayList::setViewProperties
Additionally, makes clipping with a kUnion always use a region, for
consistency with software rendering
Change-Id: I6730f1a80250bcf3f91cd4afde646d470a12dbc2
2013-02-21 16:12:00 -08:00
Michael Wright
fe98be7533
am 65b0052a: Merge "Remove SurfaceControl.setPosition(int, int)"
...
* commit '65b0052a7473b73a18aef73460c9ebec77a2c2a0':
Remove SurfaceControl.setPosition(int, int)
2013-02-21 16:09:05 -08:00
Kenny Root
49999acb04
Merge "StreamingZipInflater: fix mmap'd end of read"
2013-02-22 00:05:36 +00:00
Michael Wright
65b0052a74
Merge "Remove SurfaceControl.setPosition(int, int)"
2013-02-22 00:05:10 +00:00
Michael Wright
b7b696ee71
Remove SurfaceControl.setPosition(int, int)
...
This was just casting and calling the float version anyways, which Java does
automatically.
Bug: 8153162
Change-Id: If2f99995ff38b92e40777896baf6694786031898
2013-02-21 15:52:50 -08:00
Christopher Tate
835aac396c
am ab6b77fd: Merge "Be cool in backup/restore of apps that can\'t touch external storage"
...
* commit 'ab6b77fd85979212299d8aef0b2c83c005b13abc':
Be cool in backup/restore of apps that can't touch external storage
2013-02-21 15:50:16 -08:00
Dirk Dougherty
aca4a7760a
Doc change: Remove refs to Copy Protection and note EOL in GP.
...
Change-Id: Ia03a6173cc635a5de460cd5534c454840510b33d
Bug:6951537
2013-02-21 15:47:43 -08:00
Christopher Tate
ab6b77fd85
Merge "Be cool in backup/restore of apps that can't touch external storage"
2013-02-21 23:45:02 +00:00
Christopher Tate
5cb5c337d5
Be cool in backup/restore of apps that can't touch external storage
...
Bug: 8241337
Change-Id: I23f6eeba8448b234a7b18ce50d2ced2ba54b4ebd
2013-02-21 15:43:52 -08:00
Mathias Agopian
51eb127a17
am e4d3b06b: Merge "get rid of uses of getISurfaceTexture"
...
* commit 'e4d3b06b6ddb055739b8b2aa82ffc7840588253a':
get rid of uses of getISurfaceTexture
2013-02-21 15:24:21 -08:00
Dirk Dougherty
4d149f58f5
am 6588a52e: am 95925649: am 9de13839: am d886d128: am efa92b0b: am f32cbc3d: Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing.
...
* commit '6588a52ecd56a477bbd1dc5ff37074615a278292':
Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing.
2013-02-21 15:24:18 -08:00
Wink Saville
c7dcdfe872
am fb053cde: am f7bf667d: am b5a1ce2f: Merge "Allow three digit phone numbers"
...
* commit 'fb053cde74483f901462b5a034dd2be90a5af0da':
Allow three digit phone numbers
2013-02-21 15:24:16 -08:00
Mathias Agopian
e4d3b06b6d
Merge "get rid of uses of getISurfaceTexture"
2013-02-21 23:21:51 +00:00
Dirk Dougherty
6588a52ecd
am 95925649: am 9de13839: am d886d128: am efa92b0b: am f32cbc3d: Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing.
...
* commit '959256498ab254a59617432f31205e000f3d8a8c':
Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing.
2013-02-21 15:20:05 -08:00
Wink Saville
fb053cde74
am f7bf667d: am b5a1ce2f: Merge "Allow three digit phone numbers"
...
* commit 'f7bf667d4a5e8e3fca75640f6352724826705128':
Allow three digit phone numbers
2013-02-21 15:19:53 -08:00
Jesse Hall
aa70f2217c
Restore a mistakenly-removed null check
...
Passing null to camera.setPreviewDisplay() needs to work; this
restores the behavior from before the Surface/SurfaceControl
refactoring.
Bug: 8225538
Change-Id: Ib73bfa9fe53457a41a69b7fe5dfff3a3aa260f52
2013-02-21 15:06:27 -08:00
Dirk Dougherty
959256498a
am 9de13839: am d886d128: am efa92b0b: am f32cbc3d: Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing.
...
* commit '9de1383960314eed43c4df1c0bcc82cd883bd76f':
Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing.
2013-02-21 14:29:33 -08:00
Dirk Dougherty
9de1383960
am d886d128: am efa92b0b: am f32cbc3d: Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing.
...
* commit 'd886d12854011894d9b5f4155179c11e571a1aee':
Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing.
2013-02-21 14:25:37 -08:00
Wink Saville
f7bf667d4a
am b5a1ce2f: Merge "Allow three digit phone numbers"
...
* commit 'b5a1ce2f5daa20b5c77113b8887e12dcc05590fc':
Allow three digit phone numbers
2013-02-21 14:21:12 -08:00
Dirk Dougherty
d886d12854
am efa92b0b: am f32cbc3d: Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing.
...
* commit 'efa92b0bbe906bfac15936e5ab3f75a206cf3d24':
Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing.
2013-02-21 14:21:02 -08:00
Dirk Dougherty
efa92b0bbe
am f32cbc3d: Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing.
...
* commit 'f32cbc3d490845967e28b0995ac88187b197642c':
Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing.
2013-02-21 14:18:06 -08:00
Daniel Sandler
da37acb2f7
am e9655887: Merge "Make Notification action data structures public."
...
* commit 'e96558879ec7008ddf5647ad29d69ec1fad68c67':
Make Notification action data structures public.
2013-02-21 14:15:56 -08:00
Jeff Sharkey
fb09c375b1
am 2b3a47b9: Merge "Allow L2TP traffic to lockdown VPN servers."
...
* commit '2b3a47b9ce0f422323395286937944a2afa51ed6':
Allow L2TP traffic to lockdown VPN servers.
2013-02-21 14:15:53 -08:00
Jeff Sharkey
0ff9af2ecb
am c0997b0e: Merge "Improve notification UI for lockdown VPN."
...
* commit 'c0997b0e6291d7c97963623eed2a41994a7855cf':
Improve notification UI for lockdown VPN.
2013-02-21 14:15:51 -08:00
Irfan Sheriff
c538b730d4
am 8a64b1a7: Handle airplane settings properly
...
* commit '8a64b1a7f4b07e71b9eb0f4a98710cb1409588bf':
Handle airplane settings properly
2013-02-21 14:15:47 -08:00
Irfan Sheriff
6f85bdcacc
am b8c0e009: Restructure wifiservice for clarity
...
* commit 'b8c0e009a74ac2eaee8946fbe0bb3b3fe2749c9a':
Restructure wifiservice for clarity
2013-02-21 14:15:45 -08:00
Irfan Sheriff
713422afab
am d017f352: Move wifiservice into its own package
...
* commit 'd017f3523244974a8a3fb653ed4b6d514affcc01':
Move wifiservice into its own package
2013-02-21 14:15:42 -08:00
Craig Mautner
4636dc4c5d
am 7a7360ad: Merge "Add null check to setAppGroupId."
...
* commit '7a7360ad528576d560aa13fbb4e81740b2c425b2':
Add null check to setAppGroupId.
2013-02-21 14:15:39 -08:00
Dirk Dougherty
f32cbc3d49
Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing.
...
bug: 8033647
bug: 8033688
Change-Id: Id7b5efd48f8e13ba8c8f4ab0e0f8e5dc736b1691
2013-02-21 13:29:07 -08:00
Ben Murdoch
1c8d7f0952
Update WebView.PictureListener.onNewPicture to pass null picture.
...
When targetting >= CUR_DEVELOPMENT, the WebView.PictureListener.onNewPicture API
should pass a null picture in the callback.
Bug: 8209022, 8244082
Change-Id: I280c7cc89f2a12b1273cd67bbe2c7a6f2ca5892f
2013-02-21 20:35:21 +00:00
Daniel Sandler
458d5e1b03
Make QUICK_CLOCK work on tablets.
...
Bug: 7724222
Change-Id: Ib8f4beb206736ed01edda96fbd3638a377a8f49e
2013-02-21 15:12:49 -05:00
Derek Sollenberger
1b63e60abd
Fix use case where the Java Canvas is reused.
...
When provided with a new bitmap device the canvas will retain
certain information such as it's matrix and clip.
bug: 8167188
Change-Id: I20ac8a24eebc85fb7c147504a103ce9a95b530b3
2013-02-21 14:49:17 -05:00
Daniel Sandler
e96558879e
Merge "Make Notification action data structures public."
2013-02-21 19:38:55 +00:00
Jeff Sharkey
2b3a47b9ce
Merge "Allow L2TP traffic to lockdown VPN servers."
2013-02-21 18:33:29 +00:00
Jeff Sharkey
42c0c9f35a
Allow L2TP traffic to lockdown VPN servers.
...
Bug: 8067988
Change-Id: I6cb7d07e0c4b7c6e112a26a06892e859e6b515a8
2013-02-21 10:31:45 -08:00
Jeff Sharkey
c0997b0e62
Merge "Improve notification UI for lockdown VPN."
2013-02-21 17:49:28 +00:00
Jeff Sharkey
4fa63b2d5e
Improve notification UI for lockdown VPN.
...
Bug: 7064111
Change-Id: I9554f6a426697b4abeb2ddd0827d314920e88ed6
2013-02-21 09:47:11 -08:00
Irfan Sheriff
8a64b1a7f4
Handle airplane settings properly
...
Fix bug dealing with airplane mode settings of whether wifi
is sensitive to airplane mode change and whether wifi is
allowed to override airplane mode that likely has been
broken ever since.
Bug: 8141918
Change-Id: Ia3116c9dfce2952cbe3911e9d81dbbae0430abef
2013-02-21 08:49:54 -08:00
Irfan Sheriff
b8c0e009a7
Restructure wifiservice for clarity
...
Move seperate operation pieces into own classes
Bug: 8141918
Change-Id: Iacb15ceca5431136051e815aa71617eef89b9fe9
2013-02-21 08:49:07 -08:00
Irfan Sheriff
d017f35232
Move wifiservice into its own package
...
Change-Id: I3ff378a29cb4dd191605b0b641147eba1f445d13
2013-02-21 08:48:18 -08:00
Craig Mautner
7a7360ad52
Merge "Add null check to setAppGroupId."
2013-02-21 16:28:29 +00:00
Craig Mautner
32b44d08e2
Add null check to setAppGroupId.
...
Fix bug 8217929.
Change-Id: I3bd54c32abcf6683c2fa75a85bf5025f47e09398
2013-02-21 08:26:06 -08:00
Daniel Sandler
ea2a317368
Make Notification action data structures public.
...
Currently hidden.
Change-Id: I2a62a730f76d177577155d7ebb396b0fe51357f8
2013-02-20 22:25:01 -05:00
Jim Miller
29ae06633d
am ec6156f9: Merge "Fix the build."
...
* commit 'ec6156f9e884ba85c76a9c4683f83f18b3f64afa':
Fix the build.
2013-02-20 17:08:24 -08:00
Jim Miller
ec6156f9e8
Merge "Fix the build."
2013-02-21 01:03:21 +00:00