Scott Main
dfd85f44da
am dcf2f354: docs: simple update to OpenGl doc to update version support Note, this doc still needs a lot more work; this is a small step bug: 4395265
...
* commit 'dcf2f354963c8cdf5d70263782979cf1bd18b0bf':
docs: simple update to OpenGl doc to update version support Note, this doc still needs a lot more work; this is a small step bug: 4395265
2011-05-17 11:19:01 -07:00
Brian Carlstrom
7f35863356
Merge "Make CertInstaller installed CA certs trusted by applications via default TrustManager (1 of 6)"
2011-05-17 10:37:44 -07:00
Andreas Huber
550f667feb
am c9eb18bb: (-s ours) am bf81d4be: am c56e81c8: Merge "DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2" into honeycomb-mr2
...
* commit 'c9eb18bb72d594bdbd1593a8dc6a9b10fa44ec42':
DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2
2011-05-17 10:37:25 -07:00
Andreas Huber
fbc17e128a
am bf81d4be: am c56e81c8: Merge "DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2" into honeycomb-mr2
...
* commit 'bf81d4be0514265875d7deffe50c31a344f6eac5':
DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2
2011-05-17 10:34:41 -07:00
Andreas Huber
d42e13e38a
am c56e81c8: Merge "DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2" into honeycomb-mr2
...
* commit 'c56e81c88706d79ce51a314b5bfd3e247ca6f86c':
DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2
2011-05-17 10:31:58 -07:00
Andreas Huber
1e9440dc86
Merge "DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2" into honeycomb-mr2
2011-05-17 10:29:36 -07:00
Andreas Huber
79e058fcd4
Merge "Claim support for .3gpp2 A/B files."
2011-05-17 10:27:09 -07:00
Adam Powell
cecaf04786
am 143c529f: (-s ours) am 21f1d49f: am a7f52d46: Merge "DO NOT MERGE Use action bar overflow menus on large configurations as well as xlarge." into honeycomb-mr2
...
* commit '143c529f28bd49e077e4bc36ff30ed2ff7ffb838':
DO NOT MERGE Use action bar overflow menus on large configurations as well as xlarge.
2011-05-17 10:07:40 -07:00
Adam Powell
6ff4b14385
am b45b21d1: am b4eb3ace: am 79411726: Merge "Turn fading edges back on for ScrollView and HorizontalScrollView." into honeycomb-mr2
...
* commit 'b45b21d13e3311c819d5fbd548ff8c859cc1dfe3':
Turn fading edges back on for ScrollView and HorizontalScrollView.
2011-05-17 10:07:23 -07:00
Adam Powell
f3ee19d55c
am 21f1d49f: am a7f52d46: Merge "DO NOT MERGE Use action bar overflow menus on large configurations as well as xlarge." into honeycomb-mr2
...
* commit '21f1d49f0eac47c1ebbabf82f145dc60f988d069':
DO NOT MERGE Use action bar overflow menus on large configurations as well as xlarge.
2011-05-17 09:55:53 -07:00
Adam Powell
efbd4e9e7a
am b4eb3ace: am 79411726: Merge "Turn fading edges back on for ScrollView and HorizontalScrollView." into honeycomb-mr2
...
* commit 'b4eb3acee4504ea35a43bef9dc6220560b55d2d2':
Turn fading edges back on for ScrollView and HorizontalScrollView.
2011-05-17 09:55:32 -07:00
Adam Powell
e9a7006e63
am a7f52d46: Merge "DO NOT MERGE Use action bar overflow menus on large configurations as well as xlarge." into honeycomb-mr2
...
* commit 'a7f52d4665967b4331d38408ba81af37ec589cb4':
DO NOT MERGE Use action bar overflow menus on large configurations as well as xlarge.
2011-05-17 09:45:29 -07:00
Adam Powell
cf2cce0ad8
am 79411726: Merge "Turn fading edges back on for ScrollView and HorizontalScrollView." into honeycomb-mr2
...
* commit '79411726d5a0eb0f439b90e2f262e0b983e55d9c':
Turn fading edges back on for ScrollView and HorizontalScrollView.
2011-05-17 09:45:26 -07:00
Adam Powell
0e85987167
Merge "DO NOT MERGE Use action bar overflow menus on large configurations as well as xlarge." into honeycomb-mr2
2011-05-17 09:41:52 -07:00
Adam Powell
dee13897a2
Merge "Turn fading edges back on for ScrollView and HorizontalScrollView." into honeycomb-mr2
2011-05-17 09:41:33 -07:00
Andreas Huber
5cda4179f0
Merge "Disable yuv->yuv mode and external display support until various driver fixes are in."
2011-05-17 08:35:38 -07:00
Derek Sollenberger
3de97a5381
Merge "Updates resulting from the Skia merge (revision 1327)"
2011-05-17 04:55:56 -07:00
Dianne Hackborn
404eccbfd8
am b68c768d: am 41744836: am 7916ac65: Add new command line option to change global screen size.
...
* commit 'b68c768ddb57407bc253230c677056329c9e4bae':
Add new command line option to change global screen size.
2011-05-16 21:39:47 -07:00
Dianne Hackborn
1692eb9acd
am 41744836: am 7916ac65: Add new command line option to change global screen size.
...
* commit '417448369c170a34d76c477aa19c5293e3caa1df':
Add new command line option to change global screen size.
2011-05-16 21:29:32 -07:00
Dianne Hackborn
1885b2bd28
am 7916ac65: Add new command line option to change global screen size.
...
* commit '7916ac65dc492e4e1431879875c77d7121fbf82e':
Add new command line option to change global screen size.
2011-05-16 21:21:24 -07:00
Mathias Agopian
5b287a6ea8
eglTerminate() now actually frees up all active egl objects
...
as specified by the EGL specification, terminated objects's
handles become invalid, the objects themselves are destroyed
when they're not current to some thread.
Change-Id: Id3a4a5736a5bbc3926a9ae8385d43772edb88eeb
2011-05-16 19:03:33 -07:00
Mathias Agopian
518ec112f4
refactor EGL source code
...
no changes is functionality. split various objects into their own files.
make egl_display objec's lock internal.
2011-05-16 19:02:45 -07:00
Jamie Gennis
3629d7ff29
SurfaceFlinger: unfreeze windows for fixed size buffers.
...
This change makes SurfaceFlinger unfreeze a window if it ever gets a
buffer that is fixed-size. Normally the window would not be frozen if
its in fixed-size mode, but if the window was frozen before entering
fixed-size mode then it should be unfrozen.
Change-Id: I6bc822d4b02ae51fa8914c1f60f5d24b2002b38d
2011-05-16 16:59:04 -07:00
Jim Miller
18c7868cec
Merge "Fix the build."
2011-05-16 16:40:13 -07:00
Wink Saville
2604506cb4
am 360f5533: am 7b0339a8: Merge "No data icon switch seen between LTE to EHRPD Handover" into honeycomb-LTE
...
* commit '360f553311ab697995d24c2a42e45659a5436efa':
No data icon switch seen between LTE to EHRPD Handover
2011-05-16 16:35:10 -07:00
Wink Saville
f54dc2e5da
am 7b0339a8: Merge "No data icon switch seen between LTE to EHRPD Handover" into honeycomb-LTE
...
* commit '7b0339a8adca1347fe7ac3ac118c903ff32442a8':
No data icon switch seen between LTE to EHRPD Handover
2011-05-16 16:31:56 -07:00
Wink Saville
7f83c278fb
Merge "No data icon switch seen between LTE to EHRPD Handover" into honeycomb-LTE
2011-05-16 16:28:59 -07:00
Roman Nurik
1b6388f998
am 3eb81b63: am 136fa20d: am 8f3dbe1c: am ce6253d8: Merge "Add link to Speech Input article to resource browser, tweak outdated information in the article." into honeycomb-mr1
...
* commit '3eb81b6318f94b21a3559df57f25ff2f48fcb244':
Add link to Speech Input article to resource browser, tweak outdated information in the article.
2011-05-16 16:08:32 -07:00
Roman Nurik
06ca0a2cd7
am 136fa20d: am 8f3dbe1c: am ce6253d8: Merge "Add link to Speech Input article to resource browser, tweak outdated information in the article." into honeycomb-mr1
...
* commit '136fa20d08d3a25c49077fde076febf105452edc':
Add link to Speech Input article to resource browser, tweak outdated information in the article.
2011-05-16 16:06:27 -07:00
Roman Nurik
e6f9a38375
am 8f3dbe1c: am ce6253d8: Merge "Add link to Speech Input article to resource browser, tweak outdated information in the article." into honeycomb-mr1
...
* commit '8f3dbe1c377e64584c3ec10edf664fb278648109':
Add link to Speech Input article to resource browser, tweak outdated information in the article.
2011-05-16 16:03:31 -07:00
Roman Nurik
908a65b8f8
am ce6253d8: Merge "Add link to Speech Input article to resource browser, tweak outdated information in the article." into honeycomb-mr1
...
* commit 'ce6253d8fda92a508fa1000b5d1110e6e7a5b539':
Add link to Speech Input article to resource browser, tweak outdated information in the article.
2011-05-16 16:01:27 -07:00
Roman Nurik
12192dfc47
Merge "Add link to Speech Input article to resource browser, tweak outdated information in the article." into honeycomb-mr1
2011-05-16 15:58:08 -07:00
Wink Saville
044b25530d
am 648831cc: am 99f04c49: Merge "Fix data attempt while PS is not in-service" into honeycomb-LTE
...
* commit '648831cc85f895e95ce65509f5e9e67ed4bf2926':
Fix data attempt while PS is not in-service
2011-05-16 15:53:57 -07:00
Wink Saville
92154ba397
am 99f04c49: Merge "Fix data attempt while PS is not in-service" into honeycomb-LTE
...
* commit '99f04c4943368ea7ea7f9d28fa941a1b387e7477':
Fix data attempt while PS is not in-service
2011-05-16 15:51:02 -07:00
Wink Saville
9608bf3919
Merge "Fix data attempt while PS is not in-service" into honeycomb-LTE
2011-05-16 15:47:42 -07:00
Chia-chi Yeh
7bf84ddc26
Merge "Add a new permission for user space VPN applications."
2011-05-16 15:30:45 -07:00
Andreas Huber
d8dbf78670
Merge "Instead of using an RGB surface and conversion yuv420->rgb565"
2011-05-16 15:21:26 -07:00
Fabrice Di Meglio
7e70244d60
Merge "Adding horizontalDirection public attribute for View."
2011-05-16 15:13:10 -07:00
Justin Ho
713d1b31fa
Merge "Cleaning up notification panel drawables"
2011-05-16 14:45:38 -07:00
Irfan Sheriff
9a595e6789
am 33285c69: am 19055424: am cff1093f: Merge "Fix ISO country code of Slovenia." into honeycomb-mr2
...
* commit '33285c69a6bb01d8e3420694e257802f95d1e884':
Fix ISO country code of Slovenia.
2011-05-16 14:12:08 -07:00
Scott Main
66ea683dcb
am 5bb0c89c: am 0593d383: am 8a29ffa3: am 7a701024: docs: add redirects to key legacy docs bug: 4439292
...
* commit '5bb0c89cf86c415a94d72469684234d3f7e067ec':
docs: add redirects to key legacy docs bug: 4439292
2011-05-16 14:10:09 -07:00
Irfan Sheriff
07dceccca6
am 19055424: am cff1093f: Merge "Fix ISO country code of Slovenia." into honeycomb-mr2
...
* commit '190554246b6fda3453f4a7994fb461f841e82a4a':
Fix ISO country code of Slovenia.
2011-05-16 14:09:26 -07:00
Scott Main
7e01366f6d
am 0593d383: am 8a29ffa3: am 7a701024: docs: add redirects to key legacy docs bug: 4439292
...
* commit '0593d383f3c50853123fa99fea172b37463990e0':
docs: add redirects to key legacy docs bug: 4439292
2011-05-16 14:06:25 -07:00
Irfan Sheriff
aef5c3b0e9
am cff1093f: Merge "Fix ISO country code of Slovenia." into honeycomb-mr2
...
* commit 'cff1093fd2a2e64634e122e32d489aa40113c22f':
Fix ISO country code of Slovenia.
2011-05-16 14:06:11 -07:00
Scott Main
d669c70374
am 8a29ffa3: am 7a701024: docs: add redirects to key legacy docs bug: 4439292
...
* commit '8a29ffa3b02d5d502a6eb90c492eddcf835fc502':
docs: add redirects to key legacy docs bug: 4439292
2011-05-16 14:03:43 -07:00
Irfan Sheriff
3b440f7c8b
Merge "Fix ISO country code of Slovenia." into honeycomb-mr2
2011-05-16 14:02:39 -07:00
Scott Main
80769efc0a
am 7a701024: docs: add redirects to key legacy docs bug: 4439292
...
* commit '7a701024be7e58f840ebf9636cdad62ee4606b72':
docs: add redirects to key legacy docs bug: 4439292
2011-05-16 14:01:30 -07:00
Dianne Hackborn
54a26180ad
am 60e13114: (-s ours) am 1d340a3c: am 0eac0927: Merge "DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked." into honeycomb-mr2
...
* commit '60e13114eb806d50b7b362d39051c5c775704bf6':
DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked.
2011-05-16 13:18:54 -07:00
Dianne Hackborn
d3cf1ea694
am 1d340a3c: am 0eac0927: Merge "DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked." into honeycomb-mr2
...
* commit '1d340a3c24913d8750900355cd92ef5742eea11f':
DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked.
2011-05-16 13:16:45 -07:00
Dianne Hackborn
6d4f911185
am 0eac0927: Merge "DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked." into honeycomb-mr2
...
* commit '0eac092766d7871b34927442ee0b6e27e7e1317b':
DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked.
2011-05-16 13:13:00 -07:00