Eino-Ville Talvala
0099306b94
Merge "NEW_API: Add getTimestamp() to SurfaceTexture."
2011-03-24 15:36:56 -07:00
Scott Main
c1ddd98db8
am 9a159217: am f54972d0: am cc4b6a61: am 4045e6b9: docs: a11y doc typo
...
* commit '9a159217f538c0e228699530dceb22872bb7ba7f':
docs: a11y doc typo
2011-03-24 14:23:16 -07:00
Adam Powell
9737424cb0
Merge "Fix bug 3484000 - ActionBar visibility issue"
2011-03-24 14:20:31 -07:00
Scott Main
95ce7a252d
am f54972d0: am cc4b6a61: am 4045e6b9: docs: a11y doc typo
...
* commit 'f54972d06006ae73c88811d4a2db00d4919a1c16':
docs: a11y doc typo
2011-03-24 14:17:16 -07:00
Scott Main
2a6b3af87b
am cc4b6a61: am 4045e6b9: docs: a11y doc typo
...
* commit 'cc4b6a61c6df67c211ac85d49f457fd562abf142':
docs: a11y doc typo
2011-03-24 14:11:39 -07:00
Romain Guy
6692e29c34
Merge "Always apply the tile mode. Bug #4170455 "
2011-03-24 14:05:49 -07:00
Scott Main
39ced64baa
am 4045e6b9: docs: a11y doc typo
...
* commit '4045e6b9ab296436cb5344f3af7184c2ce2a8ff0':
docs: a11y doc typo
2011-03-24 14:00:47 -07:00
Romain Guy
3d6f59bd82
Merge "Avoid NPE in postInvalidate(). Bug #4048131 "
2011-03-24 13:30:37 -07:00
Scott Main
76f1f1c015
am c6752c37: am c55a6eed: am 119e79cf: am e0b3f2a7: docs: fix a few things in a11y doc
...
* commit 'c6752c370c89c5860265427ef17afc3179261523':
docs: fix a few things in a11y doc
2011-03-24 12:32:56 -07:00
Scott Main
5ade1065ee
am c55a6eed: am 119e79cf: am e0b3f2a7: docs: fix a few things in a11y doc
...
* commit 'c55a6eed2587f642b2c12ed65f85def7f62d6339':
docs: fix a few things in a11y doc
2011-03-24 12:31:02 -07:00
Scott Main
96fcbb6431
am 119e79cf: am e0b3f2a7: docs: fix a few things in a11y doc
...
* commit '119e79cf2763592389b4543612400d746bb9aeb2':
docs: fix a few things in a11y doc
2011-03-24 12:29:24 -07:00
Scott Main
2accd81522
am e0b3f2a7: docs: fix a few things in a11y doc
...
* commit 'e0b3f2a788e63a10b0fa21bdd700fbcf7e1add34':
docs: fix a few things in a11y doc
2011-03-24 12:26:58 -07:00
Scott Main
ed3363063f
am 67b2f3f1: am e8eb0f73: am 95cb883c: am b7cfa729: Merge "docs: add document for accessibility, authored by Cheryl Simon (clsimon)" into honeycomb
...
* commit '67b2f3f1914d93731e8a9260915f6a0c7c6fddcb':
docs: add document for accessibility, authored by Cheryl Simon (clsimon)
2011-03-24 12:17:15 -07:00
Gloria Wang
9873cdfdbc
am 3c1c3d89: (-s ours) am 480edfb9: am e2cd3353: Merge "Fix for bug 4165823. Add death listener to clean-up drmserver appropriately when drmserver died. Cherry-pick from master. Do not merge." into honeycomb-mr1
...
* commit '3c1c3d898ca1ade5f8ef0f71ddb928af3a780276':
Fix for bug 4165823. Add death listener to clean-up drmserver appropriately when drmserver died. Cherry-pick from master. Do not merge.
2011-03-24 12:17:12 -07:00
Bill Gruber
d14928ffcf
am 24a5c354: am d631dd03: am 6efa3599: am e002734d: Merge "IAB doc updates for final launch plus bug fixes Bug: 3491550 Bug: 3491426 Bug: 3407948" into honeycomb
...
* commit '24a5c354f18ebb583a18df685575243129c1c43c':
IAB doc updates for final launch plus bug fixes Bug: 3491550 Bug: 3491426 Bug: 3407948
2011-03-24 12:17:05 -07:00
Romain Guy
e74f31b850
Merge "Correctly check bottom padding in setPadding()."
2011-03-24 12:04:20 -07:00
Stephen Hines
a48439d58b
Merge "Revert "Fix cleanup bug clearing script references.""
2011-03-24 12:00:09 -07:00
Adam Powell
64599cf94b
Merge "Fix bug 4136071 - CAB causes the action bar to be shown, regardless of previous state"
2011-03-24 11:16:13 -07:00
Scott Main
fbb463da20
am e8eb0f73: am 95cb883c: am b7cfa729: Merge "docs: add document for accessibility, authored by Cheryl Simon (clsimon)" into honeycomb
...
* commit 'e8eb0f732111ff660b36365365fab21c685e1d6b':
docs: add document for accessibility, authored by Cheryl Simon (clsimon)
2011-03-24 10:56:49 -07:00
Scott Main
22bb60049e
am 95cb883c: am b7cfa729: Merge "docs: add document for accessibility, authored by Cheryl Simon (clsimon)" into honeycomb
...
* commit '95cb883c066b754a96c899b48bd487e2ad0f213d':
docs: add document for accessibility, authored by Cheryl Simon (clsimon)
2011-03-24 10:54:08 -07:00
Scott Main
1ba7e63c5b
am b7cfa729: Merge "docs: add document for accessibility, authored by Cheryl Simon (clsimon)" into honeycomb
...
* commit 'b7cfa72932fbb3c794c6e5509b4a5b716236f558':
docs: add document for accessibility, authored by Cheryl Simon (clsimon)
2011-03-24 10:51:50 -07:00
Scott Main
94a11356ca
Merge "docs: add document for accessibility, authored by Cheryl Simon (clsimon)" into honeycomb
2011-03-24 10:49:59 -07:00
Gloria Wang
15e14b312d
am 480edfb9: am e2cd3353: Merge "Fix for bug 4165823. Add death listener to clean-up drmserver appropriately when drmserver died. Cherry-pick from master. Do not merge." into honeycomb-mr1
...
* commit '480edfb9e0c90ae1ae970a1e5e09640db112803e':
Fix for bug 4165823. Add death listener to clean-up drmserver appropriately when drmserver died. Cherry-pick from master. Do not merge.
2011-03-24 10:43:44 -07:00
Gloria Wang
d8776379e7
am e2cd3353: Merge "Fix for bug 4165823. Add death listener to clean-up drmserver appropriately when drmserver died. Cherry-pick from master. Do not merge." into honeycomb-mr1
...
* commit 'e2cd33531182b31e0ace2c3acb0e960fbf1ba273':
Fix for bug 4165823. Add death listener to clean-up drmserver appropriately when drmserver died. Cherry-pick from master. Do not merge.
2011-03-24 10:42:14 -07:00
Gloria Wang
0d7705ebbe
Merge "Fix for bug 4165823. Add death listener to clean-up drmserver appropriately when drmserver died. Cherry-pick from master. Do not merge." into honeycomb-mr1
2011-03-24 10:40:26 -07:00
Bill Gruber
6c2b65c3d6
am d631dd03: am 6efa3599: am e002734d: Merge "IAB doc updates for final launch plus bug fixes Bug: 3491550 Bug: 3491426 Bug: 3407948" into honeycomb
...
* commit 'd631dd03ec235300fb323922125b21becfd947ed':
IAB doc updates for final launch plus bug fixes Bug: 3491550 Bug: 3491426 Bug: 3407948
2011-03-24 10:35:53 -07:00
Bill Gruber
12596d4568
am 6efa3599: am e002734d: Merge "IAB doc updates for final launch plus bug fixes Bug: 3491550 Bug: 3491426 Bug: 3407948" into honeycomb
...
* commit '6efa3599590d3c75a648c3d93353011eb8e30278':
IAB doc updates for final launch plus bug fixes Bug: 3491550 Bug: 3491426 Bug: 3407948
2011-03-24 10:33:53 -07:00
Bill Gruber
71a3126787
am e002734d: Merge "IAB doc updates for final launch plus bug fixes Bug: 3491550 Bug: 3491426 Bug: 3407948" into honeycomb
...
* commit 'e002734dd2b330ff6f964eeccaf3c6c6207dd9bf':
IAB doc updates for final launch plus bug fixes Bug: 3491550 Bug: 3491426 Bug: 3407948
2011-03-24 10:30:30 -07:00
Bill Gruber
bc10d42b04
Merge "IAB doc updates for final launch plus bug fixes Bug: 3491550 Bug: 3491426 Bug: 3407948" into honeycomb
2011-03-24 10:26:20 -07:00
Romain Guy
f6087c2404
Merge "Use the correct API to query system properties."
2011-03-23 19:57:23 -07:00
Romain Guy
828c85a3c5
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
4e72c1c2b1
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
850a8f3465
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
Teng-Hui Zhu
2bd3e68743
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
f064666e4f
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
915cc451dd
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
9e80b03cc9
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
e1a8c619ce
Merge "retire android_native_window_t"
2011-03-23 17:19:28 -07:00
Romain Guy
345aa73012
Merge "Don't crash when omitting paint to drawBitmap() with A8 configs."
2011-03-23 17:19:24 -07:00
Eric Hassold
b14009c758
Merge "Check for initialized EGLDisplay when required by specification"
2011-03-23 17:13:58 -07:00
Glenn Kasten
1e470ae2ae
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
cc2d2fe37e
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
414ceb5c33
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
2f73ec16ab
Merge "Bug 4159373 Use HDCP debug settings" into honeycomb-mr1
2011-03-23 17:03:46 -07:00
Romain Guy
781676ea7e
Merge "Fix shaders generation on IMG GPUs."
2011-03-23 16:57:35 -07:00
Romain Guy
fe3ecd3bb6
Merge "Apply color filters to bitmaps."
2011-03-23 16:56:18 -07:00
Iliyan Malchev
5cfbdc87d6
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
98eac4d717
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
eb194f0de1
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
Teng-Hui Zhu
db5c4f03d1
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