Jason Sams
66db3ab50f
Cleaup of rsComponent to remove GL types.
...
Change-Id: I9f82bafe42f5fb30335b15f38eb251dc1ec62e80
2011-05-26 17:05:51 -07:00
Romain Guy
0f667ff5e5
am a33bb164: am 4686fb8a: Merge "DO NOT MERGE Correctly implement the CLEAR xfermode." into honeycomb-mr2
...
* commit 'a33bb164b2ac792d5bba76ba198fb052197fd520':
DO NOT MERGE Correctly implement the CLEAR xfermode.
2011-05-26 17:00:14 -07:00
Romain Guy
a33bb164b2
am 4686fb8a: Merge "DO NOT MERGE Correctly implement the CLEAR xfermode." into honeycomb-mr2
...
* commit '4686fb8ac8c88eb1f0d76fc4157be4cb5949e98e':
DO NOT MERGE Correctly implement the CLEAR xfermode.
2011-05-26 16:57:18 -07:00
Romain Guy
4686fb8ac8
Merge "DO NOT MERGE Correctly implement the CLEAR xfermode." into honeycomb-mr2
2011-05-26 16:55:33 -07:00
Romain Guy
e324197ecd
DO NOT MERGE Correctly implement the CLEAR xfermode.
...
This bug is a regression from the software pipeline and prevents
applications from implementing an "eraser" type tool (for instance
a drawing/painting apps.) This issue affects external applications
when they turn on hardware acceleration.
The previous implementation was using glBlendFunc with the parameters
GL_ZERO/GL_ZERO which doesn't work for text, paths and other alpha
sources (anti-aliasing.) The correct implementation is GL_ZERO/
GL_ONE_MINUS_SRC_ALPHA.
Change-Id: I1446e83480e46174b880120069d76fcad14ba300
2011-05-26 16:53:26 -07:00
Romain Guy
f9187df698
Merge "Correctly implement the CLEAR xfermode."
2011-05-26 16:43:26 -07:00
Romain Guy
f504a2fa14
Correctly implement the CLEAR xfermode.
...
The previous implementation was using glBlendFunc with the parameters
GL_ZERO/GL_ZERO which doesn't work for text, paths and other alpha
sources (anti-aliasing.) The correct implementation is GL_ZERO/
GL_ONE_MINUS_SRC_ALPHA.
Change-Id: I4cca65e57b6a37bbf5a41d382cb0648ee8e11e79
2011-05-26 16:40:55 -07:00
Jason Sams
0d92e3441f
Merge "Start splitting allocation into hal and core."
2011-05-26 16:37:09 -07:00
Jason Sams
7e8aae7f76
Start splitting allocation into hal and core.
...
Change-Id: Ic506abb0469238cb0471eb1401cfcb7b2fbbe4bb
2011-05-26 16:33:01 -07:00
Huahui Wu
18773812cf
Merge "b/4452171 Dumping video playbacks to files."
2011-05-26 16:31:28 -07:00
Gilles Debunne
ca6c3a2bba
am 4ce6822b: am 24de44a1: Merge "ExternalStorageFormatter takes an optional StorageVolume target." into honeycomb-mr2
...
* commit '4ce6822bc63665ca3e9d9984766f367ce4f4d3a7':
ExternalStorageFormatter takes an optional StorageVolume target.
2011-05-26 15:50:13 -07:00
Adam Powell
73d0a60628
Merge "Fix bug 4487948 - action bar tabs + configuration change = :("
2011-05-26 15:47:21 -07:00
Gilles Debunne
4ce6822bc6
am 24de44a1: Merge "ExternalStorageFormatter takes an optional StorageVolume target." into honeycomb-mr2
...
* commit '24de44a1877be3e5d63697f90c98a87a4d88b1fb':
ExternalStorageFormatter takes an optional StorageVolume target.
2011-05-26 15:47:14 -07:00
Adam Powell
25151e4792
Fix bug 4487948 - action bar tabs + configuration change = :(
...
Change-Id: If7f622865ae5597cd9fb664a2952481da5c7e09a
2011-05-26 15:44:59 -07:00
Gilles Debunne
24de44a187
Merge "ExternalStorageFormatter takes an optional StorageVolume target." into honeycomb-mr2
2011-05-26 15:44:18 -07:00
Eric Fischer
a524dbd4a9
Merge "Import revised translations."
2011-05-26 15:37:27 -07:00
Eric Fischer
8447a13f9c
Import revised translations.
...
Change-Id: I10a93a6f3a274354e88263d86a8855d1e7121f58
2011-05-26 15:34:01 -07:00
Scott Main
2bb7432d8f
am f18348b1: am a2272130: cherry pick Change-Id: Ia5ac228612569684a4ffc79ab3914442c15edfe2 docs: fix typo and slight revision
...
* commit 'f18348b1225926435ddfa505192a7462208be0ca':
cherry pick Change-Id: Ia5ac228612569684a4ffc79ab3914442c15edfe2 docs: fix typo and slight revision
2011-05-26 15:31:13 -07:00
Scott Main
a4ab8bd518
am 70f45917: am f5d8ceae: cherry pick Change-Id: I58ae8210a17f76ff92ee9d064cf42fd4a81ad9b5 docs: fix markup and typos
...
* commit '70f4591762a0ca0fca71ebfe156a8916b0a9475c':
cherry pick Change-Id: I58ae8210a17f76ff92ee9d064cf42fd4a81ad9b5 docs: fix markup and typos
2011-05-26 15:31:10 -07:00
Scott Main
b9cb731bb8
am b7cfc618: am 28fb09e0: cherry pick Change-Id: I183ff47e59617b2c17a92b876ca8c8bcc9b45262 docs: add document for the compatibility library
...
* commit 'b7cfc6181be090cc93d304a96e035f5a754085ae':
cherry pick Change-Id: I183ff47e59617b2c17a92b876ca8c8bcc9b45262 docs: add document for the compatibility library
2011-05-26 15:31:07 -07:00
Scott Main
f18348b122
am a2272130: cherry pick Change-Id: Ia5ac228612569684a4ffc79ab3914442c15edfe2 docs: fix typo and slight revision
...
* commit 'a22721301181fb995559d5badd9d286803a0ec86':
cherry pick Change-Id: Ia5ac228612569684a4ffc79ab3914442c15edfe2 docs: fix typo and slight revision
2011-05-26 15:26:28 -07:00
Scott Main
70f4591762
am f5d8ceae: cherry pick Change-Id: I58ae8210a17f76ff92ee9d064cf42fd4a81ad9b5 docs: fix markup and typos
...
* commit 'f5d8ceae68993e3af9905e58c8c6bdf90872880c':
cherry pick Change-Id: I58ae8210a17f76ff92ee9d064cf42fd4a81ad9b5 docs: fix markup and typos
2011-05-26 15:23:49 -07:00
Scott Main
a227213011
cherry pick Change-Id: Ia5ac228612569684a4ffc79ab3914442c15edfe2
...
docs: fix typo and slight revision
Change-Id: I33ec5fef9f04dad6deae5681571c36bf70205569
2011-05-26 15:21:38 -07:00
Scott Main
b7cfc6181b
am 28fb09e0: cherry pick Change-Id: I183ff47e59617b2c17a92b876ca8c8bcc9b45262 docs: add document for the compatibility library
...
* commit '28fb09e0b27a97e4664c9a31a3c72a067794b4c6':
cherry pick Change-Id: I183ff47e59617b2c17a92b876ca8c8bcc9b45262 docs: add document for the compatibility library
2011-05-26 15:21:34 -07:00
Amith Yamasani
405c1af756
Manual merge. Preference activity changes to work on smaller tablet screens and phones.
...
Padding around fragments and to the left of preference items
adjusted for different display sizes.
Change-Id: I2d29e5525c381092a3f1d2fb1265ce07db893d78
2011-05-26 15:20:14 -07:00
Scott Main
f5d8ceae68
cherry pick Change-Id: I58ae8210a17f76ff92ee9d064cf42fd4a81ad9b5
...
docs: fix markup and typos
Change-Id: Ib0c5a0b41bfa2e9faef9b9b8e2cad8a69e6e1c8b
2011-05-26 15:19:07 -07:00
Matthew Xie
c3b8491868
Add wide band speech feature flag
...
Add a boolean flag resource to indicate if current platform supports
bluetooth wide band speech.
This is part of Handsfree 1.6 new feature change.
Bug 4449070
Change-Id: Iee5e969d030108382dd2fa6568ce3d80c6b611d6
2011-05-26 15:17:10 -07:00
Scott Main
28fb09e0b2
cherry pick Change-Id: I183ff47e59617b2c17a92b876ca8c8bcc9b45262
...
docs: add document for the compatibility library
Change-Id: I1825ae1fba0be664a7c6a8b0ba32166f216a893f
2011-05-26 15:16:01 -07:00
Shimeng (Simon) Wang
09cb64bcd1
Fix zoom overview width and postscale for non-wide-viewport mode.
...
issue: 4396010
Change-Id: I90aefac9fdf53834c0774d5c1b37693413798689
2011-05-26 15:09:12 -07:00
Dianne Hackborn
df6e980e3f
Add new supports-screens attributes for declaring the compatible screens.
...
Change-Id: I40d57e4354e48accc1027c9f90916ea73eb5190d
android:requiresSmallestWidthDp provides the smallest supported width.
android:compatibleWidthLimitDp provides the largest compatible width.
2011-05-26 14:48:04 -07:00
Adam Powell
d31320d58f
am 47dae694: am 7eba403e: Merge "DO NOT MERGE - Fix bug 4489946 - Remove placeholder views for phones in smaller-screen decor layouts." into honeycomb-mr2
...
* commit '47dae694d7476e8a3de1e9b487b89e003b8440b1':
DO NOT MERGE - Fix bug 4489946 - Remove placeholder views for phones in smaller-screen decor layouts.
2011-05-26 14:14:50 -07:00
Kenny Root
2b26dee8b2
am 5e34a194: am 1d8f8819: Merge "Break apart queries to getInstalled* API DO NOT MERGE" into honeycomb-mr2
...
* commit '5e34a1945a6b26dff5551a37627c5216b076d896':
Break apart queries to getInstalled* API DO NOT MERGE
2011-05-26 14:14:48 -07:00
Scott Main
dcf305ebf9
am 101139cc: am c3123961: DO NOT MERGE cherry pick Change-Id: I67ef29f8ccc7b4a754ebb24efd96e9821e3d8662 docs: add accepted values for setting status bar visibility
...
* commit '101139cc8f5b975dfacf1a2ffd3bdae8e3907f65':
DO NOT MERGE cherry pick Change-Id: I67ef29f8ccc7b4a754ebb24efd96e9821e3d8662 docs: add accepted values for setting status bar visibility
2011-05-26 14:14:45 -07:00
Dianne Hackborn
469465c45e
am 0821f274: am 2a108403: I am a dummy.
...
* commit '0821f2745d05af98195c9c1c7889ca14e9c56e0b':
I am a dummy.
2011-05-26 14:14:41 -07:00
Dianne Hackborn
76450622f0
am d5238cc1: am 7a09f72b: Merge "Rework how we decide whether to use system or status bar." into honeycomb-mr2
...
* commit 'd5238cc1ab8366389b2aada228f2f2e5cbb3244e':
Rework how we decide whether to use system or status bar.
2011-05-26 14:14:35 -07:00
Eric Fischer
0bb63c58a4
am 90856661: am 66fd9ab2: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
...
* commit '90856661cf07453a23c3737f421a4686b70d95c1':
Import revised translations. DO NOT MERGE
2011-05-26 14:14:31 -07:00
Adam Powell
47dae694d7
am 7eba403e: Merge "DO NOT MERGE - Fix bug 4489946 - Remove placeholder views for phones in smaller-screen decor layouts." into honeycomb-mr2
...
* commit '7eba403e9a64f7153b7e5788902d4f799739158e':
DO NOT MERGE - Fix bug 4489946 - Remove placeholder views for phones in smaller-screen decor layouts.
2011-05-26 13:34:45 -07:00
Kenny Root
5e34a1945a
am 1d8f8819: Merge "Break apart queries to getInstalled* API DO NOT MERGE" into honeycomb-mr2
...
* commit '1d8f8819f1e98cdf3b7756396158613e95fe9eb6':
Break apart queries to getInstalled* API DO NOT MERGE
2011-05-26 13:34:42 -07:00
Scott Main
101139cc8f
am c3123961: DO NOT MERGE cherry pick Change-Id: I67ef29f8ccc7b4a754ebb24efd96e9821e3d8662 docs: add accepted values for setting status bar visibility
...
* commit 'c31239616cca417e71acb98813df7eda645835df':
DO NOT MERGE cherry pick Change-Id: I67ef29f8ccc7b4a754ebb24efd96e9821e3d8662 docs: add accepted values for setting status bar visibility
2011-05-26 13:34:40 -07:00
Dianne Hackborn
0821f2745d
am 2a108403: I am a dummy.
...
* commit '2a108403803bd30bee1c019060c208fb8c52c10c':
I am a dummy.
2011-05-26 13:34:37 -07:00
Dianne Hackborn
d5238cc1ab
am 7a09f72b: Merge "Rework how we decide whether to use system or status bar." into honeycomb-mr2
...
* commit '7a09f72b8850ec22e4ca7fd50aba20ead7666f67':
Rework how we decide whether to use system or status bar.
2011-05-26 13:34:33 -07:00
Eric Fischer
90856661cf
am 66fd9ab2: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
...
* commit '66fd9ab236b3df85a32792caec41a2cd83622e28':
Import revised translations. DO NOT MERGE
2011-05-26 13:34:29 -07:00
Adam Powell
7eba403e9a
Merge "DO NOT MERGE - Fix bug 4489946 - Remove placeholder views for phones in smaller-screen decor layouts." into honeycomb-mr2
2011-05-26 13:26:33 -07:00
Adam Powell
dc61f26701
DO NOT MERGE - Fix bug 4489946 - Remove placeholder views for phones
...
in smaller-screen decor layouts.
Keep the internal id declared to keep code in sync with downstream
branches.
Change-Id: I25d2ff7c40c220ecc93b195dfd4e953fe0b4d944
2011-05-26 13:24:08 -07:00
Kenny Root
1d8f8819f1
Merge "Break apart queries to getInstalled* API DO NOT MERGE" into honeycomb-mr2
2011-05-26 13:10:23 -07:00
Simon Wilson
62388cfc1f
resolved conflicts for merge of a38fad37 to honeycomb-plus-aosp
...
Conflicts:
telephony/java/com/android/internal/telephony/cdma/SmsMessage.java
Change-Id: I4c808c752954c5d1f752f4b4c02ad41ea491e416
2011-05-26 12:53:15 -07:00
Scott Main
c31239616c
DO NOT MERGE
...
cherry pick Change-Id: I67ef29f8ccc7b4a754ebb24efd96e9821e3d8662
docs: add accepted values for setting status bar visibility
Change-Id: I255dcd62b71c1b4ca40187b395abce8d6836c249
2011-05-26 12:44:08 -07:00
James Dong
03edf6b364
Merge "Extract embedded cover art (aka poster frame) in mp4 files"
2011-05-26 12:00:51 -07:00
Gilles Debunne
37051cdd86
ExternalStorageFormatter takes an optional StorageVolume target.
...
Change-Id: Ic85689659dbf49a7fcc1b7aaf25e4a94e62848b9
2011-05-26 11:45:17 -07:00
Dianne Hackborn
2a10840380
I am a dummy.
...
Change-Id: Ie6908a8931954f83ab0e9b905173b576dbf3661d
2011-05-26 11:45:00 -07:00