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
Romain Guy
ba7c35dcc7
Merge "Take fake bold font property into account. Bug #4159731 "
2011-03-23 15:00:24 -07:00
Romain Guy
c7b25be64f
Take fake bold font property into account.
...
Bug #4159731
For real this time!
Change-Id: I9cb6d70e68d2b57eb9a6d9a6bca8176967192421
2011-03-23 14:59:20 -07:00
Bill Gruber
0357ec78b8
Merge "DRM API doc scrub This change contains information contributed by Sony Corporation. Bug: 4119363" into honeycomb-mr1
2011-03-23 14:58:31 -07:00
Scott Main
f0e8f367ca
am 8346a6c2: am ee7cfaf2: am 18cd686f: am ef6b305b: docs: fix markup error
...
* commit '8346a6c27311afdce4755807a23a8edcf1f52f66':
docs: fix markup error
2011-03-23 14:49:38 -07:00
Scott Main
8346a6c273
am ee7cfaf2: am 18cd686f: am ef6b305b: docs: fix markup error
...
* commit 'ee7cfaf28969998ca15800f99bcdab2596051865':
docs: fix markup error
2011-03-23 14:47:34 -07:00
Scott Main
ee7cfaf289
am 18cd686f: am ef6b305b: docs: fix markup error
...
* commit '18cd686fc828c9c75596de1494ecaa5467fcc195':
docs: fix markup error
2011-03-23 14:43:35 -07:00
Scott Main
18cd686fc8
am ef6b305b: docs: fix markup error
...
* commit 'ef6b305b93009b60ad7c6ddbd200d1b5c554963f':
docs: fix markup error
2011-03-23 14:32:44 -07:00
Scott Main
ef6b305b93
docs: fix markup error
...
Change-Id: I59e379a7a36c4184862095442c53a6b9496d856e
2011-03-23 14:23:02 -07:00
Simon Wilson
43831b9290
am d4f4fb98: (-s ours) am 03aa986e: (-s ours) am 1ba4897e: Merge "DO NOT MERGE Change WiMAX indicator display" into gingerbread
...
* commit 'd4f4fb98ed4c3d0e36a0a873390914007863135a':
DO NOT MERGE Change WiMAX indicator display
2011-03-23 14:11:31 -07:00
Simon Wilson
d4f4fb98ed
am 03aa986e: (-s ours) am 1ba4897e: Merge "DO NOT MERGE Change WiMAX indicator display" into gingerbread
...
* commit '03aa986e6b19e436c71801d2e5af6f44521a94ab':
DO NOT MERGE Change WiMAX indicator display
2011-03-23 14:06:16 -07:00
repo sync
adbf9d8585
am d5ba9c22: Merge "resolved conflicts for merge of 17f95e92 to honeycomb-plus-aosp" into honeycomb-plus-aosp
...
* commit 'd5ba9c22236346578ce34e3e8b475b8cad9773dd':
remove the code that clears the passwords when the sim is replaced with a different one.
2011-03-23 13:49:35 -07:00
repo sync
d5ba9c2223
Merge "resolved conflicts for merge of 17f95e92 to honeycomb-plus-aosp" into honeycomb-plus-aosp
2011-03-23 13:46:32 -07:00
Bill Gruber
0e092f806b
DRM API doc scrub
...
This change contains information contributed by Sony Corporation.
Bug: 4119363
Change-Id: I6f565c15d512d675993dc65f7fee19bd3d0bc0fa
2011-03-23 13:21:48 -07:00
Chet Haase
96b16ed1a8
Merge "Add custom fragment anims to be run when popping backstack"
2011-03-23 11:25:09 -07:00
Fabrice Di Meglio
aa5eb64a0c
Merge "Use Harfbuzz instead of ICU4C for computing advances"
2011-03-23 10:56:41 -07:00
Scott Main
e939f261e0
am bfc10795: am 01b649aa: am 7d02efa1: am fb340563: docs: add Asus driver link to oem driver page
...
* commit 'bfc10795f21383b6d48aff3476ceeb79cdfce194':
docs: add Asus driver link to oem driver page
2011-03-23 10:45:03 -07:00
Scott Main
bfc10795f2
am 01b649aa: am 7d02efa1: am fb340563: docs: add Asus driver link to oem driver page
...
* commit '01b649aa3ac9a8c1d2aff03f51e66438092d0691':
docs: add Asus driver link to oem driver page
2011-03-23 10:38:02 -07:00
Scott Main
01b649aa3a
am 7d02efa1: am fb340563: docs: add Asus driver link to oem driver page
...
* commit '7d02efa1029435dfa3a4a9f8449ee1cbda543730':
docs: add Asus driver link to oem driver page
2011-03-23 10:33:49 -07:00
Scott Main
7d02efa102
am fb340563: docs: add Asus driver link to oem driver page
...
* commit 'fb340563e81f93bc179e51bffc846ac03ff02609':
docs: add Asus driver link to oem driver page
2011-03-23 10:25:00 -07:00
Scott Main
fb340563e8
docs: add Asus driver link to oem driver page
...
Change-Id: Ia93dd9a6c2c23f236b75a9c83acb8ce4c4b94ffa
2011-03-23 10:15:36 -07:00
Chet Haase
bc377841db
Add custom fragment anims to be run when popping backstack
...
The previous fragment implementation allowed for animations
during fragment transitions, but did not account for the
different behavior of fragments when popping the back stack.
In general, you probably don't want to run the same animation
for putting a fragment on the stack as for popping it off, which
is what happens now. For example, you might fade a fragment out when
putting it on the stack. But when popping ot off, fading it out
is probably not the behavior you want.
The new API (setCustomAnimations() overload with two additional
parameters) allows developers to specify animations to be run
in the popping operation. Otherwise, the animations are null and
the operation will not be animated.
Change-Id: I2e132b3890838358e496149f18a25037a59990aa
2011-03-23 09:35:00 -07:00
Robert Greenwalt
15cb32ed9d
am 5635dc93: am 0b6d0445: am ac70fb8b: Merge "Fix adding of default route." into honeycomb-mr1
...
* commit '5635dc9313dc6ca3ea739e4ca36c42a2c58537e9':
Fix adding of default route.
2011-03-22 21:40:54 -07:00
Robert Greenwalt
5635dc9313
am 0b6d0445: am ac70fb8b: Merge "Fix adding of default route." into honeycomb-mr1
...
* commit '0b6d044567b9c3004eb7ed826fd593019cd24352':
Fix adding of default route.
2011-03-22 21:39:19 -07:00
Robert Greenwalt
0b6d044567
am ac70fb8b: Merge "Fix adding of default route." into honeycomb-mr1
...
* commit 'ac70fb8be6ea3a6b49d0a8a26e99c25f92013516':
Fix adding of default route.
2011-03-22 21:37:48 -07:00
Robert Greenwalt
ac70fb8be6
Merge "Fix adding of default route." into honeycomb-mr1
2011-03-22 21:36:04 -07:00
shailendra
2d06aee095
Fix for Media Server memory leak
...
bug - 4081123
Change-Id: Ic88c13f8006227cff2c91a31f5d1828d007125af
2011-03-22 21:30:35 -07:00
Fabrice Di Meglio
9f82b580d7
Use Harfbuzz instead of ICU4C for computing advances
...
- use Harfbuzz shaper for shaping and getting glyphs
- add test app for showing result of drawText() and drawGlyphs()
- add private API in Canvas and Paint for test app
Change-Id: Ia15be216f8636d2d864066e9b7de2f53008c30f6
2011-03-22 19:36:30 -07:00
Mathias Agopian
462db220a2
fix [4056232] Deprecate Sensor.TYPE_TEMPERATURE and add Sensor.TYPE_AMBIENT_TEMPERATURE
...
Bug: 4056232
Change-Id: Idf165460fc083f856c320f0f6f8841d73661c829
2011-03-22 19:12:13 -07:00
Eric Rowe
94d76925c2
am 2f97217b: am 22e21da6: am 5e66ccf5: Merge "Clean up BT stress tests." into honeycomb-mr1
...
* commit '2f97217bfca0e89b88498c44a8f0f5ad35091b0a':
Clean up BT stress tests.
2011-03-22 19:03:14 -07:00
Eric Rowe
2f97217bfc
am 22e21da6: am 5e66ccf5: Merge "Clean up BT stress tests." into honeycomb-mr1
...
* commit '22e21da663677d12768d38b95d65a747a4a0540b':
Clean up BT stress tests.
2011-03-22 19:00:57 -07:00