Kenny Root
d6cb90fb8b
Merge changes Ia7add63e,Ic7571dae
...
* changes:
Split dump and annotate users of mPackages lock
Split PackageManagerService into subclasses
2011-03-25 14:41:34 -07:00
Gilles Debunne
3182f884d1
Merge "Fix a leak in TextView around ViewTreeObserver"
2011-03-25 11:57:17 -07:00
Adam Cohen
88b9b5ed4a
Merge "Modifying RemoteViewsFactory interface"
2011-03-25 11:19:34 -07:00
James Dong
74e888d579
am 70a5b031: am 9fb98238: am 837430dd: Merge "Switch to use SF cached source" into honeycomb-mr1
...
* commit '70a5b0317d5029b34be26a423c0ebeaa74b728ed':
Switch to use SF cached source
2011-03-25 10:29:20 -07:00
James Dong
cdfb20ceb5
am 9fb98238: am 837430dd: Merge "Switch to use SF cached source" into honeycomb-mr1
...
* commit '9fb98238e5837a68fb16bcb9a23469f27124c304':
Switch to use SF cached source
2011-03-25 10:27:05 -07:00
James Dong
f518993012
am 837430dd: Merge "Switch to use SF cached source" into honeycomb-mr1
...
* commit '837430dd3440f6e71f68ef755399e22386dee084':
Switch to use SF cached source
2011-03-25 10:24:44 -07:00
James Dong
c613ed429e
Merge "Switch to use SF cached source" into honeycomb-mr1
2011-03-25 10:22:57 -07:00
Gloria Wang
c751b639de
am ed7b688c: am aac43ea1: am b8b85ea2: Merge "Fix for bug 4126624. Change the mDrmManagerClientImpl to sp to avoid double delete the pointer." into honeycomb-mr1
...
* commit 'ed7b688c015dbd064b81dfaed5dd6c7ed6728ac3':
Fix for bug 4126624. Change the mDrmManagerClientImpl to sp to avoid double delete the pointer.
2011-03-25 10:11:49 -07:00
Gloria Wang
9deed0123f
am aac43ea1: am b8b85ea2: Merge "Fix for bug 4126624. Change the mDrmManagerClientImpl to sp to avoid double delete the pointer." into honeycomb-mr1
...
* commit 'aac43ea193e0cbd440854f3425579f9ff04abac3':
Fix for bug 4126624. Change the mDrmManagerClientImpl to sp to avoid double delete the pointer.
2011-03-25 10:09:09 -07:00
Gloria Wang
3c2c14bad9
am b8b85ea2: Merge "Fix for bug 4126624. Change the mDrmManagerClientImpl to sp to avoid double delete the pointer." into honeycomb-mr1
...
* commit 'b8b85ea296b09cfc5f986e8ee38b959776050d43':
Fix for bug 4126624. Change the mDrmManagerClientImpl to sp to avoid double delete the pointer.
2011-03-25 10:05:50 -07:00
Gloria Wang
9111ab8d91
Merge "Fix for bug 4126624. Change the mDrmManagerClientImpl to sp to avoid double delete the pointer." into honeycomb-mr1
2011-03-25 10:01:37 -07:00
Jesse Wilson
94654b395f
Merge "Fix MemoryFile's output stream to advance."
2011-03-25 08:47:53 -07:00
Brian Carlstrom
087c01b4fa
Merge "Tracking SamplingProfiler change in libcore"
2011-03-24 20:38:05 -07:00
Romain Guy
7acfd6f683
Merge "Fix text redering issue where the text was sometimes truncated"
2011-03-24 18:09:28 -07:00
David Li
922ddd6dad
Merge "GLESv2Dbg: ability to create GL calls from client"
2011-03-24 16:43:02 -07:00
David Li
fef0451f7f
Merge "GLES2Dbg: added SETPROP expectResponse"
2011-03-24 16:42:58 -07:00
David Li
3f9c90c1ec
Merge "GLES2Dbg: added reference frame for glReadPixels"
2011-03-24 16:42:53 -07:00
David Li
e315b16e8f
Merge "GLES2Dbg: use libLZF for compressing images"
2011-03-24 16:42:44 -07:00
Jeff Brown
2b01027965
Merge "Added a hovered state for drawables."
2011-03-24 16:42:08 -07:00
Romain Guy
4c7f0fd482
Merge "When deleting a path, remove it from the path cache. Bug #4170585 "
2011-03-24 16:05:13 -07:00
Chet Haase
5ec5109374
Merge "Fix bug with accelerated translucent rendering"
2011-03-24 16:04:22 -07:00
Michael Jurka
16eac7151e
Merge "Fixing invalidate problems in software rendered mode"
2011-03-24 16:00:50 -07:00
Adam Powell
143902180b
Merge "Fix bug 4084399 - with usb keyboard, actionbar menuitems with icon+text take dpad focus twice in row"
2011-03-24 15:57:55 -07:00
Jeff Brown
dfaa7b1e8e
Merge "Add MotionEvent.HOVER_ENTER and HOVER_EXIT."
2011-03-24 15:38:04 -07:00
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