Michael Jurka
d0872bd38a
Fixing invalidate problems in software rendered mode
2011-03-24 15:45:27 -07:00
Romain Guy
cf38b0cea6
Merge "Correctly check bottom padding in setPadding()."
2011-03-24 12:04:20 -07:00
Romain Guy
13f35f3ce6
Correctly check bottom padding in setPadding().
...
Change-Id: Ie8099d37ad865acc559c4a4d34eb84960a1a19f3
2011-03-24 12:03:17 -07:00
Stephen Hines
46709f13c7
Merge "Revert "Fix cleanup bug clearing script references.""
2011-03-24 12:00:09 -07:00
Stephen Hines
044d7d99f8
Revert "Fix cleanup bug clearing script references."
...
This change was actually incorrect and causes crashes in ~Context.
This reverts commit 88728ecaeab1358e1748cbbf6ed954fd9a960692.
2011-03-24 11:50:40 -07:00
Adam Powell
5728d924a9
Merge "Fix bug 4136071 - CAB causes the action bar to be shown, regardless of previous state"
2011-03-24 11:16:13 -07:00
Adam Powell
07e1f988c0
Fix bug 4136071 - CAB causes the action bar to be shown, regardless of
...
previous state
Hide the action bar upon finishing a mode if it was hidden when the
mode started. If show() is called while the mode is active, the bar
will not hide when the mode finishes.
Change-Id: I7d9b593b9ecd9fa633251abebcdca0d85405252a
2011-03-24 11:12:58 -07:00
Jesse Wilson
ff5569948f
Don't link to Harmony implementation details in public APIs.
...
Change-Id: I8a157d64d87443b512a5b958d52a0769ef01ef7b
2011-03-24 10:36:52 -07:00
Romain Guy
c78504dca6
Merge "Use the correct API to query system properties."
2011-03-23 19:57:23 -07:00
Romain Guy
aaceeb0c5b
Use the correct API to query system properties.
...
Change-Id: Ie120dee0e24959d4db3fdb0100b6d8fe7fe46cdb
2011-03-23 19:56:13 -07:00
Romain Guy
81335980dd
am e28f8351: (-s ours) am ee061921: am b5fa4909: DO NOT MERGE Take fake bold font property into account. Bug #4159731
...
* commit 'e28f83519a447b9f49a218d0b337e3921db24b39':
DO NOT MERGE Take fake bold font property into account. Bug #4159731
2011-03-23 19:35:36 -07:00
Romain Guy
e28f83519a
am ee061921: am b5fa4909: DO NOT MERGE Take fake bold font property into account. Bug #4159731
...
* commit 'ee0619214934a6828b810f2e8a108bd461736ea9':
DO NOT MERGE Take fake bold font property into account. Bug #4159731
2011-03-23 19:33:54 -07:00
Romain Guy
ee06192149
am b5fa4909: DO NOT MERGE Take fake bold font property into account. Bug #4159731
...
* commit 'b5fa490995dff116b8a6fdc274bee6f6db4d0d0c':
DO NOT MERGE Take fake bold font property into account. Bug #4159731
2011-03-23 19:31:38 -07:00
Romain Guy
b5fa490995
DO NOT MERGE Take fake bold font property into account.
...
Bug #4159731
For real this time!
Change-Id: I042eca64bfb355f8d60cec430eb942c900062761
2011-03-23 17:59:44 -07:00
Teng-Hui Zhu
d9f68bc9e0
am 842b914f: am a7605d3b: am 2d09b855: Merge "When the video is not on the front, it should be paused" into honeycomb-mr1
...
* commit '842b914f26633aa94f3c63fbfc6a6b521904e1b8':
When the video is not on the front, it should be paused
2011-03-23 17:38:28 -07:00
Teng-Hui Zhu
842b914f26
am a7605d3b: am 2d09b855: Merge "When the video is not on the front, it should be paused" into honeycomb-mr1
...
* commit 'a7605d3b2ec9526fc369e5e0a1a37880db2c0694':
When the video is not on the front, it should be paused
2011-03-23 17:36:03 -07:00
Teng-Hui Zhu
a7605d3b2e
am 2d09b855: Merge "When the video is not on the front, it should be paused" into honeycomb-mr1
...
* commit '2d09b855d5c0749ab845d3f2775125fea294f07c':
When the video is not on the front, it should be paused
2011-03-23 17:34:15 -07:00
Teng-Hui Zhu
2d09b855d5
Merge "When the video is not on the front, it should be paused" into honeycomb-mr1
2011-03-23 17:32:43 -07:00
Iliyan Malchev
f66b219a77
Merge "retire android_native_window_t"
2011-03-23 17:19:28 -07:00
Romain Guy
9a9e8eefec
Merge "Don't crash when omitting paint to drawBitmap() with A8 configs."
2011-03-23 17:19:24 -07:00
Romain Guy
5b7a3150a6
Don't crash when omitting paint to drawBitmap() with A8 configs.
...
Change-Id: I3d630554ad82fa846385274d12d0434e890ef45d
2011-03-23 17:18:44 -07:00
Eric Hassold
2a5fbcd6b1
Merge "Check for initialized EGLDisplay when required by specification"
2011-03-23 17:13:58 -07:00
Glenn Kasten
7c06ac00e1
am 64233b86: am 503f4daf: am 0b1b2a32: Merge "Bug 4159373 Use HDCP debug settings" into honeycomb-mr1
...
* commit '64233b86f3a78d2c4a21092b242ad071a6b38bd5':
Bug 4159373 Use HDCP debug settings
2011-03-23 17:09:55 -07:00
Glenn Kasten
64233b86f3
am 503f4daf: am 0b1b2a32: Merge "Bug 4159373 Use HDCP debug settings" into honeycomb-mr1
...
* commit '503f4daf0113579e111d371dbfb6824cc8c311f1':
Bug 4159373 Use HDCP debug settings
2011-03-23 17:07:54 -07:00
Glenn Kasten
503f4daf01
am 0b1b2a32: Merge "Bug 4159373 Use HDCP debug settings" into honeycomb-mr1
...
* commit '0b1b2a3212cc6c96959e009a9705f94f2ed8b4f4':
Bug 4159373 Use HDCP debug settings
2011-03-23 17:06:12 -07:00
Glenn Kasten
0b1b2a3212
Merge "Bug 4159373 Use HDCP debug settings" into honeycomb-mr1
2011-03-23 17:03:46 -07:00
Romain Guy
dd3c1bde77
Merge "Fix shaders generation on IMG GPUs."
2011-03-23 16:57:35 -07:00
Romain Guy
80bbfb19ee
Fix shaders generation on IMG GPUs.
...
Change-Id: Id15df2663e41e31f04c8d86b958312341da8101d
2011-03-23 16:56:28 -07:00
Romain Guy
6325b622ad
Merge "Apply color filters to bitmaps."
2011-03-23 16:56:18 -07:00
Teng-Hui Zhu
1e26d82ffa
When the video is not on the front, it should be paused
...
bug:4165855
Change-Id: Icbdab81fe5beb8642841b16773b0e5350b4221cf
2011-03-23 16:56:12 -07:00
Romain Guy
56215274f2
Apply color filters to bitmaps.
...
Change-Id: I36354a6a2d330b2e61ed2af12b6701b151880288
2011-03-23 16:55:38 -07:00
Iliyan Malchev
7b49b97627
retire android_native_window_t
...
Change-Id: I232c526168e1a93977d1c2d0fa74c8937cdeb23b
Signed-off-by: Iliyan Malchev <malchev@google.com>
2011-03-23 16:43:20 -07:00
Teng-Hui Zhu
d6f8f798f2
am fee1d146: am 50373509: am efb8eda4: Merge "Make sure the full screen playing continue when timeout" into honeycomb-mr1
...
* commit 'fee1d146a3285e887712150496bbf002f4945079':
Make sure the full screen playing continue when timeout
2011-03-23 16:09:46 -07:00
Wink Saville
8189e72e9d
am 50e17002: am 464b2259: Merge "Fix NPE in CatService.encodeOptionalTags." into honeycomb-LTE
...
* commit '50e1700247fbb552f7b2837915e6752fe609258e':
Fix NPE in CatService.encodeOptionalTags.
2011-03-23 16:09:43 -07:00
Glenn Kasten
1b11b64bb6
Bug 4159373 Use HDCP debug settings
...
Change-Id: Iefc0a0d4b574ee94fbc83bf74b57c1d3465c821c
2011-03-23 16:08:18 -07:00
Teng-Hui Zhu
fee1d146a3
am 50373509: am efb8eda4: Merge "Make sure the full screen playing continue when timeout" into honeycomb-mr1
...
* commit '503735099d51e9701be4737dff4e74b35361d371':
Make sure the full screen playing continue when timeout
2011-03-23 16:07:57 -07:00
Wink Saville
50e1700247
am 464b2259: Merge "Fix NPE in CatService.encodeOptionalTags." into honeycomb-LTE
...
* commit '464b2259c9c70b36c534e8f2380ff45130a84c66':
Fix NPE in CatService.encodeOptionalTags.
2011-03-23 16:07:54 -07:00
Teng-Hui Zhu
503735099d
am efb8eda4: Merge "Make sure the full screen playing continue when timeout" into honeycomb-mr1
...
* commit 'efb8eda41a2dce03db0984c490c16f6a32867ded':
Make sure the full screen playing continue when timeout
2011-03-23 16:06:10 -07:00
Wink Saville
464b2259c9
Merge "Fix NPE in CatService.encodeOptionalTags." into honeycomb-LTE
2011-03-23 16:05:52 -07:00
shailendra
88a14dcd1c
am 6b49e9a8: am a450ef06: am ac390b8c: Merge "Fix for Media Server memory leak" into honeycomb-mr1
...
* commit '6b49e9a8829c87088dc7fbc0945237030e63327a':
Fix for Media Server memory leak
2011-03-23 16:03:46 -07:00
Teng-Hui Zhu
efb8eda41a
Merge "Make sure the full screen playing continue when timeout" into honeycomb-mr1
2011-03-23 16:03:04 -07:00
Bill Gruber
f46821b9d9
am 640f63c2: am 3bde4594: am 0357ec78: Merge "DRM API doc scrub This change contains information contributed by Sony Corporation. Bug: 4119363" into honeycomb-mr1
...
* commit '640f63c2669fc9dc38b349066d4d28111655dc3f':
DRM API doc scrub This change contains information contributed by Sony Corporation. Bug: 4119363
2011-03-23 16:00:30 -07:00
Eric Hassold
2a790ac34d
Check for initialized EGLDisplay when required by specification
...
Check for initialized display, and set EGL error to EGL_NOT_INITIALIZED
whenever it isn't, for all EGL functions taking an EGLDisplay as argument
and requiring it to have been initialized.
Bug: 3366011
Change-Id: Ib1d8a3a207257995518f4430fe97f8c406c7fc13
2011-03-23 15:59:00 -07:00
shailendra
6b49e9a882
am a450ef06: am ac390b8c: Merge "Fix for Media Server memory leak" into honeycomb-mr1
...
* commit 'a450ef06689b44415a3bbbfb4aaad082189eb7ad':
Fix for Media Server memory leak
2011-03-23 15:53:25 -07:00
Bill Gruber
640f63c266
am 3bde4594: am 0357ec78: Merge "DRM API doc scrub This change contains information contributed by Sony Corporation. Bug: 4119363" into honeycomb-mr1
...
* commit '3bde4594d5794645b5f7e0ff1bf9c4a0b44161b1':
DRM API doc scrub This change contains information contributed by Sony Corporation. Bug: 4119363
2011-03-23 15:51:23 -07:00
shailendra
a450ef0668
am ac390b8c: Merge "Fix for Media Server memory leak" into honeycomb-mr1
...
* commit 'ac390b8cacc45c866ae2e60c0e492a914cf6ec78':
Fix for Media Server memory leak
2011-03-23 15:47:47 -07:00
Wink Saville
6b68779ab3
Fix NPE in CatService.encodeOptionalTags.
...
If cmdDet.typeOfCommand is bad fromInt returns null we now log the
error instead of causing a Null Pointer Exception.
Change-Id: Id6a0d295d988c2bdbd46a0c0dd6b20f5baf02b27
2011-03-23 15:47:25 -07:00
Bill Gruber
3bde4594d5
am 0357ec78: Merge "DRM API doc scrub This change contains information contributed by Sony Corporation. Bug: 4119363" into honeycomb-mr1
...
* commit '0357ec78b82ae104e56c26941d42fa7ef875462b':
DRM API doc scrub This change contains information contributed by Sony Corporation. Bug: 4119363
2011-03-23 15:43:09 -07:00
shailendra
ac390b8cac
Merge "Fix for Media Server memory leak" into honeycomb-mr1
2011-03-23 15:33:51 -07:00
Teng-Hui Zhu
2deec6651c
Make sure the full screen playing continue when timeout
...
bug:4165804
Change-Id: I5e0f4bdaecce36d074941ae6631b211227c13fcb
2011-03-23 15:29:22 -07:00