Jack Palevich
a66cf8783f
Merge "Add GL11ExtensionPack support to GLDebugWrapper"
2011-01-27 16:48:28 -08:00
Mike Lockwood
dd8b64c0a5
Merge "Add support for synchronous bulk USB transfers"
2011-01-27 16:25:26 -08:00
Ashish Sharma
89316a2f2a
Merge "TrafficStats: Include UDP stats and packet count to API"
2011-01-27 16:22:50 -08:00
Mike Lockwood
1fce24b241
Add support for synchronous bulk USB transfers
...
Change-Id: Id5de49e4d728a702fa1583ecc24f83f36cc57d21
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-01-27 16:22:15 -08:00
Santosh Madhava
05b536e671
am c4f5b712: am 270cbcc1: Merge "Fix for issue 3370007 Overlay transparency in Java" into honeycomb
...
* commit 'c4f5b712049a5891bc2d1a87031134f3fe0acb03':
Fix for issue 3370007 Overlay transparency in Java
2011-01-27 16:04:44 -08:00
Santosh Madhava
c4f5b71204
am 270cbcc1: Merge "Fix for issue 3370007 Overlay transparency in Java" into honeycomb
...
* commit '270cbcc16a72f982d84afeb5e3fd3f166936394a':
Fix for issue 3370007 Overlay transparency in Java
2011-01-27 16:02:59 -08:00
Adam Powell
4d7b10630a
am e3ba5cfe: am d1f94e36: Merge "Fix bug 3399725 - externally reported issue 14317: android:scrollbarSize attribute does not work in ScrollView tag" into honeycomb
...
* commit 'e3ba5cfe9b4f524d955f77f5fff53440d80f9464':
Fix bug 3399725 - externally reported issue 14317: android:scrollbarSize attribute does not work in ScrollView tag
2011-01-27 16:02:33 -08:00
Santosh Madhava
270cbcc16a
Merge "Fix for issue 3370007 Overlay transparency in Java" into honeycomb
2011-01-27 16:00:15 -08:00
Adam Powell
e3ba5cfe9b
am d1f94e36: Merge "Fix bug 3399725 - externally reported issue 14317: android:scrollbarSize attribute does not work in ScrollView tag" into honeycomb
...
* commit 'd1f94e36da6276acc00d0a3267a505fd6a61702d':
Fix bug 3399725 - externally reported issue 14317: android:scrollbarSize attribute does not work in ScrollView tag
2011-01-27 15:59:46 -08:00
Adam Powell
d1f94e36da
Merge "Fix bug 3399725 - externally reported issue 14317: android:scrollbarSize attribute does not work in ScrollView tag" into honeycomb
2011-01-27 15:58:18 -08:00
Xavier Ducrohet
d1654ab25c
am 4c02c224: am a3e586af: Merge "LayoutLib: Properly compute available space to layouts." into honeycomb
...
* commit '4c02c2246a9060487e4a7be3389c23c8533f9a5d':
LayoutLib: Properly compute available space to layouts.
2011-01-27 15:56:32 -08:00
Xavier Ducrohet
4c02c2246a
am a3e586af: Merge "LayoutLib: Properly compute available space to layouts." into honeycomb
...
* commit 'a3e586af439137eb4216bc7ba62167f516e028c2':
LayoutLib: Properly compute available space to layouts.
2011-01-27 15:53:46 -08:00
Justin Ho
e6d599c03f
am d931cb47: am 0a5481db: Merge "Pushing in fixed scrubber asset" into honeycomb
...
* commit 'd931cb4731929d25c4aeb495a8df802f6f939d26':
Pushing in fixed scrubber asset
2011-01-27 15:53:12 -08:00
Ashish Sharma
c39c1d4dee
TrafficStats: Include UDP stats and packet count to API
...
Change-Id: I70063e6033d3c181bcc5b9e401f9474900e25281
Signed-off-by: Ashish Sharma <ashishsharma@google.com>
2011-01-27 15:52:38 -08:00
Xavier Ducrohet
a3e586af43
Merge "LayoutLib: Properly compute available space to layouts." into honeycomb
2011-01-27 15:51:13 -08:00
Justin Ho
d931cb4731
am 0a5481db: Merge "Pushing in fixed scrubber asset" into honeycomb
...
* commit '0a5481db2256651ffe75e0f6e7e01b333ea5df3f':
Pushing in fixed scrubber asset
2011-01-27 15:50:26 -08:00
Justin Ho
2d10ceae15
am f6edcc47: am c1913ecc: Merge "Removing old pocket assets" into honeycomb
...
* commit 'f6edcc4710f9e0cd2f118a52c3d90ef425971398':
Removing old pocket assets
2011-01-27 15:49:58 -08:00
Justin Ho
f6edcc4710
am c1913ecc: Merge "Removing old pocket assets" into honeycomb
...
* commit 'c1913eccb15513a1b75928131649ff93eaaeedb3':
Removing old pocket assets
2011-01-27 15:48:22 -08:00
Justin Ho
0a5481db22
Merge "Pushing in fixed scrubber asset" into honeycomb
2011-01-27 15:47:31 -08:00
Justin Ho
c1913eccb1
Merge "Removing old pocket assets" into honeycomb
2011-01-27 15:46:45 -08:00
Justin Ho
e43649e863
Pushing in fixed scrubber asset
...
Bug: 3362749
Bug: 3398524
Change-Id: Ib8a830bc23c7d1283ef44ba13f3b8fe4f72afbf3
2011-01-27 15:45:46 -08:00
Romain Guy
e90a8b06b7
am 01a58129: am 0250bc2f: Merge "Catch exception when ViewRoot\'s surface is not valid. Bug #3399426 " into honeycomb
...
* commit '01a5812902668d0dbba51cd0efe22bfba3711230':
Catch exception when ViewRoot's surface is not valid. Bug #3399426
2011-01-27 15:45:38 -08:00
Romain Guy
01a5812902
am 0250bc2f: Merge "Catch exception when ViewRoot\'s surface is not valid. Bug #3399426 " into honeycomb
...
* commit '0250bc2faca14a332155b9111e0ee5dfc8493d6a':
Catch exception when ViewRoot's surface is not valid. Bug #3399426
2011-01-27 15:43:03 -08:00
Xavier Ducrohet
1658422512
LayoutLib: Properly compute available space to layouts.
...
Also display placeholders for status/title/action bars depending
on if the app is a tablet and its theme.
Change-Id: I651c1a2e5cfde165e004c11b236e6df056853dec
2011-01-27 15:41:38 -08:00
Romain Guy
0250bc2fac
Merge "Catch exception when ViewRoot's surface is not valid. Bug #3399426 " into honeycomb
2011-01-27 15:41:08 -08:00
Romain Guy
fea12b87f2
Catch exception when ViewRoot's surface is not valid.
...
Bug #3399426
Change-Id: Id4e0b8714c9520c4e84e81c2978752d46c912b6b
2011-01-27 15:36:40 -08:00
Derek Sollenberger
fdc8757ac4
am f454cee0: am 8f9fb947: Merge "Add Plugin API for controling the device power states" into honeycomb
...
* commit 'f454cee04456acf74871b02033e6972f71919e55':
Add Plugin API for controling the device power states
2011-01-27 15:31:23 -08:00
Derek Sollenberger
f454cee044
am 8f9fb947: Merge "Add Plugin API for controling the device power states" into honeycomb
...
* commit '8f9fb94741b5032c8774f87130133ef14d9af4e2':
Add Plugin API for controling the device power states
2011-01-27 15:28:52 -08:00
Derek Sollenberger
8f9fb94741
Merge "Add Plugin API for controling the device power states" into honeycomb
2011-01-27 15:26:53 -08:00
Basavapatna Dattaguru
4f54da9629
am b408c3e9: am 64a2c359: Merge "Fix Issue: 3373525: reduces app. 100mS in create" into honeycomb
...
* commit 'b408c3e984dbc3af43befc6fd16ff74dd24457a9':
Fix Issue: 3373525: reduces app. 100mS in create
2011-01-27 15:12:16 -08:00
Adam Powell
150b7ae97e
am e4960883: am 43d7b83e: Merge "Fix bug 3391818 - Keyboard covers the "Show in chat list" selection in talk > Friend Info" into honeycomb
...
* commit 'e49608831178981a3de06019e15c5c8918734d62':
Fix bug 3391818 - Keyboard covers the "Show in chat list" selection in talk > Friend Info
2011-01-27 15:12:12 -08:00
Gilles Debunne
6f1ef59eb4
am 1ad0fac2: am 6f7a6bc3: Merge "Soft keyboard is not shown when text selection mode is aborted." into honeycomb
...
* commit '1ad0fac2f4ca502e66358cee11a46475690ead07':
Soft keyboard is not shown when text selection mode is aborted.
2011-01-27 15:12:03 -08:00
Huahui Wu
c9d6123521
am 491784f2: am cbcdc614: Merge "b/3347670 Support installing online certs to the system keystore." into honeycomb
...
* commit '491784f2ecf617f787e11c2393d190b657b2ecde':
b/3347670 Support installing online certs to the system keystore.
2011-01-27 15:11:59 -08:00
Justin Ho
1190d2d6d9
am 63b2af9b: am c7b032d9: Fixing download notification icons
...
* commit '63b2af9bc0dee57bf0447b6166e579cd9496049f':
Fixing download notification icons
2011-01-27 15:11:55 -08:00
Vasu Nori
2d73dcbbc5
am 242fa0eb: am ce3b35a7: Merge "bug:3398527 return List insttead of ArrayList from public API" into honeycomb
...
* commit '242fa0eb73d555eb025c39cf212030f00cb53cb4':
bug:3398527 return List insttead of ArrayList from public API
2011-01-27 15:11:44 -08:00
Daniel Sandler
4eb5bed550
am 57e7aa12: am 74d39bd9: Merge "Correct the translationY of the empty notification panel." into honeycomb
...
* commit '57e7aa12d960cc20b2620b367be39e921f1a145d':
Correct the translationY of the empty notification panel.
2011-01-27 15:11:38 -08:00
Gilles Debunne
7191d6ec83
am 82ba0eca: am 315f3865: Merge "CustomSelectionActionModeCallback can prevent selection mode from starting." into honeycomb
...
* commit '82ba0ecaa72df892a34c279ac449e752e87f7ed8':
CustomSelectionActionModeCallback can prevent selection mode from starting.
2011-01-27 15:11:33 -08:00
Gilles Debunne
079527c306
am 7af3a6f3: am bbdd9d3f: Merge "Refresh the list of preloaded drawables and color state lists" into honeycomb
...
* commit '7af3a6f3ddec456ade2c671e9ef53030d7b9f1a2':
Refresh the list of preloaded drawables and color state lists
2011-01-27 15:11:27 -08:00
Chet Haase
38d1f25308
am 19312cfe: am 246bf85a: Merge "Fix NPE with display lists when view not attached" into honeycomb
...
* commit '19312cfef15608fca2c8403dc240e8ec4f54d6b7':
Fix NPE with display lists when view not attached
2011-01-27 15:11:20 -08:00
Basavapatna Dattaguru
b408c3e984
am 64a2c359: Merge "Fix Issue: 3373525: reduces app. 100mS in create" into honeycomb
...
* commit '64a2c359aeda59e4bc43d48f31ade919e918ea26':
Fix Issue: 3373525: reduces app. 100mS in create
2011-01-27 15:03:36 -08:00
Adam Powell
e496088311
am 43d7b83e: Merge "Fix bug 3391818 - Keyboard covers the "Show in chat list" selection in talk > Friend Info" into honeycomb
...
* commit '43d7b83ed92d54eeaf81e8e8b554daee1741df7b':
Fix bug 3391818 - Keyboard covers the "Show in chat list" selection in talk > Friend Info
2011-01-27 15:03:22 -08:00
Gilles Debunne
1ad0fac2f4
am 6f7a6bc3: Merge "Soft keyboard is not shown when text selection mode is aborted." into honeycomb
...
* commit '6f7a6bc3454fce5cfb86a0fc6a37022d24d1e465':
Soft keyboard is not shown when text selection mode is aborted.
2011-01-27 15:03:19 -08:00
Huahui Wu
491784f2ec
am cbcdc614: Merge "b/3347670 Support installing online certs to the system keystore." into honeycomb
...
* commit 'cbcdc6147aa7dd4bcfcdaae6fc673c68f9be5dcf':
b/3347670 Support installing online certs to the system keystore.
2011-01-27 15:02:09 -08:00
Justin Ho
63b2af9bc0
am c7b032d9: Fixing download notification icons
...
* commit 'c7b032d95bfae8b956dd4da8b6cbbd94ab534137':
Fixing download notification icons
2011-01-27 15:01:54 -08:00
Vasu Nori
242fa0eb73
am ce3b35a7: Merge "bug:3398527 return List insttead of ArrayList from public API" into honeycomb
...
* commit 'ce3b35a7b0b80061692d9fa1977cee68b365728c':
bug:3398527 return List insttead of ArrayList from public API
2011-01-27 15:00:38 -08:00
Daniel Sandler
57e7aa12d9
am 74d39bd9: Merge "Correct the translationY of the empty notification panel." into honeycomb
...
* commit '74d39bd902c8561153647b19625b32938f38498c':
Correct the translationY of the empty notification panel.
2011-01-27 15:00:33 -08:00
Gilles Debunne
82ba0ecaa7
am 315f3865: Merge "CustomSelectionActionModeCallback can prevent selection mode from starting." into honeycomb
...
* commit '315f3865983f59e5ad9f42602f443e8c42b6e5c4':
CustomSelectionActionModeCallback can prevent selection mode from starting.
2011-01-27 15:00:29 -08:00
Gilles Debunne
7af3a6f3dd
am bbdd9d3f: Merge "Refresh the list of preloaded drawables and color state lists" into honeycomb
...
* commit 'bbdd9d3fbc1995adb4d327515ba0af8515436d2d':
Refresh the list of preloaded drawables and color state lists
2011-01-27 15:00:23 -08:00
Chet Haase
19312cfef1
am 246bf85a: Merge "Fix NPE with display lists when view not attached" into honeycomb
...
* commit '246bf85aaacbadf4e892270d714efcdb280a3de8':
Fix NPE with display lists when view not attached
2011-01-27 15:00:17 -08:00
Derek Sollenberger
f3196cd70a
Add Plugin API for controling the device power states
...
This is an initial API that will allow the plugin to request to
keep the screen on.
companion change is in external/webkit
bug: 3331493
Change-Id: Ic18787e7ecd705a5b2e31a34ea884fd39ad9d11a
2011-01-27 18:00:14 -05:00