Scott Main
c55a6eed25
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
119e79cf27
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
382ab8eb4f
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
08a208938f
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
47238183b9
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
Scott Main
e0b3f2a788
docs: fix a few things in a11y doc
...
Change-Id: I142b0b4498cf6d19655ad1ccc2066e59c39e75a6
2011-03-24 12:15:35 -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
Scott Main
67b2f3f191
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
e8eb0f7321
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
95cb883c06
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
b7cfa72932
Merge "docs: add document for accessibility, authored by Cheryl Simon (clsimon)" into honeycomb
2011-03-24 10:49:59 -07:00
Gloria Wang
3c1c3d898c
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
480edfb9e0
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
e2cd335311
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
Jesse Wilson
ff5569948f
Don't link to Harmony implementation details in public APIs.
...
Change-Id: I8a157d64d87443b512a5b958d52a0769ef01ef7b
2011-03-24 10:36:52 -07:00
Bill Gruber
24a5c354f1
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
d631dd03ec
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
Gloria Wang
9e1e9a339e
Fix for bug 4165823.
...
Add death listener to clean-up drmserver appropriately when drmserver died.
Cherry-pick from master. Do not merge.
Change-Id: I7782cc96ce173a87ebfd315950f3880fa90294d6
2011-03-24 10:30:57 -07:00
Bill Gruber
6efa359959
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
e002734dd2
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
Bill Gruber
dd8ea580d4
IAB doc updates for final launch plus bug fixes
...
Bug: 3491550
Bug: 3491426
Bug: 3407948
Change-Id: I6f02397a62a3f73599ac7ded28e47d9bb1a3d3e9
2011-03-24 10:23:52 -07:00
Scott Main
ef467c8d95
docs: add document for accessibility, authored by Cheryl Simon (clsimon)
...
Change-Id: If4f6e4f12953ae5b608efebde1ac9d3f0720035a
2011-03-24 10:16:31 -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
Kenny Root
447106fc83
Split dump and annotate users of mPackages lock
...
Split the dump() command between PMS and Settings.
Try to annotate all users of the mPackages lock in preparation for
switch to reader/writer lock.
Also mark some locals final as I was reading through the usage of the
synchronization on mPackages.
Change-Id: Ia7add63e835e67156edf886f98acebe50cc41f70
2011-03-23 17:20:04 -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