Xavier Ducrohet
f9b3ee835e
am 56259594: Merge "Move support lib to rev 6." into ics-mr1
...
* commit '56259594da620757e95172ef6ff68cade501da51':
Move support lib to rev 6.
2011-12-12 18:09:56 -08:00
Dianne Hackborn
fd286c353f
am 170b26ba: Merge "SDK only: add markup for use in documentation." into ics-mr1
...
* commit '170b26ba32bd86df929a8a27fefde91a114f3831':
SDK only: add markup for use in documentation.
2011-12-12 18:09:52 -08:00
Jesse Hall
18ff0e6a86
am 5d721ef6: am b0a30e43: EmuGL: remove broken EGL buffer refcounting
...
* commit '5d721ef6a14dc22c6b44042f83f3a48ad68d05d4':
EmuGL: remove broken EGL buffer refcounting
2011-12-12 18:09:45 -08:00
Xavier Ducrohet
56259594da
Merge "Move support lib to rev 6." into ics-mr1
2011-12-12 17:00:44 -08:00
Xavier Ducrohet
4a6b52bc98
Move support lib to rev 6.
...
Change-Id: Iad48f3d8b7d8399df4286f2a8995a079797d25ea
2011-12-12 17:00:09 -08:00
Dianne Hackborn
170b26ba32
Merge "SDK only: add markup for use in documentation." into ics-mr1
2011-12-12 16:09:23 -08:00
Jesse Hall
5d721ef6a1
am b0a30e43: EmuGL: remove broken EGL buffer refcounting
...
* commit 'b0a30e43889415a9a40b9519392ad3be295b9465':
EmuGL: remove broken EGL buffer refcounting
2011-12-12 15:23:59 -08:00
Dianne Hackborn
e0c8f946e6
SDK only: add markup for use in documentation.
...
Change-Id: Ia379c178a41db146a47a494b5c24e5f77d65ada7
2011-12-12 15:15:19 -08:00
Jesse Hall
b0a30e4388
EmuGL: remove broken EGL buffer refcounting
...
The emulator EGL implementation tried to hold its own reference to
buffers acquired/released with dequeueBuffer/queueBuffer, but was
missing an incRef after dequeueBuffer during swapBuffers.
Since the native window holds a reference to the buffer between
dequeueBuffer and queueBuffer, the EGL reference isn't needed anyway.
Change-Id: I95e4f9f4faf59198f99939cdca6603fe176c56bc
2011-12-12 14:05:16 -08:00
Xavier Ducrohet
a05b88e168
am fed7d838: Move samples to API 15.
...
* commit 'fed7d838d0b4eec94bd2d5910fa496bd1849052e':
Move samples to API 15.
2011-12-09 16:36:30 -08:00
Xavier Ducrohet
fed7d838d0
Move samples to API 15.
...
Change-Id: I70a065033ad157ca15cddf56e81c631c301854a0
2011-12-09 16:34:20 -08:00
Xavier Ducrohet
99dbc05515
am 646e7964: Merge "Increase skin ram and vmheap." into ics-mr1
...
* commit '646e7964f94f0ba55f67e91996009833b2dd0ead':
Increase skin ram and vmheap.
2011-12-09 15:55:36 -08:00
James Dong
f657a0a7ff
am 4fed461d: Revert "Revert "Update the media_profiles.xml file to include..."
...
* commit '4fed461d11d1dad11acfebc200343aa4194083d0':
Revert "Revert "Update the media_profiles.xml file to include..."
2011-12-09 15:55:32 -08:00
Xavier Ducrohet
646e7964f9
Merge "Increase skin ram and vmheap." into ics-mr1
2011-12-09 15:42:26 -08:00
Xavier Ducrohet
7400b43b8c
Increase skin ram and vmheap.
...
Change-Id: I96d8f6249ab7110717f21cd339acd8a803a579d3
2011-12-09 15:41:45 -08:00
James Dong
4fed461d11
Revert "Revert "Update the media_profiles.xml file to include..."
...
This reverts commit 2400b2c340 .
Change-Id: I7f6823385448db5f94cdfc4df8cdf32ab9d156c2
2011-12-09 12:40:30 -08:00
Bruno Oliveira
359ad04d49
am 7e3475ca: am 4ea24bff: cherrypick from master cl Change-Id: I45f91fd9cfe0cb89789017deec63565e4757063e Adding the NewsReader sample.
...
* commit '7e3475caf3c397b4a416ccf2f9f373e4edc34fcf':
cherrypick from master cl Change-Id: I45f91fd9cfe0cb89789017deec63565e4757063e Adding the NewsReader sample.
2011-12-09 12:09:38 -08:00
Bruno Oliveira
7e3475caf3
am 4ea24bff: cherrypick from master cl Change-Id: I45f91fd9cfe0cb89789017deec63565e4757063e Adding the NewsReader sample.
...
* commit '4ea24bff40770c987add689970c64cf63077dd3f':
cherrypick from master cl Change-Id: I45f91fd9cfe0cb89789017deec63565e4757063e Adding the NewsReader sample.
2011-12-09 12:07:31 -08:00
Bruno Oliveira
4ea24bff40
cherrypick from master cl Change-Id: I45f91fd9cfe0cb89789017deec63565e4757063e
...
Adding the NewsReader sample.
This sample demonstrates how to design a UI for multiple screens and
is part of the "Designing for Multiple Screens" AndroidU lesson.
Change-Id: I462261933c68b3a40f9611fcf7153c25abdfcd5d
2011-12-09 11:55:36 -08:00
David Hu
600fe5e419
am 61cffb06: Merge "Change the test to user the listener mechanism" into ics-mr1
...
* commit '61cffb06334cd0677b70ef224f40d35822f720b3':
Change the test to user the listener mechanism
2011-12-08 16:40:53 -08:00
David Hu
61cffb0633
Merge "Change the test to user the listener mechanism" into ics-mr1
2011-12-08 16:38:19 -08:00
Xavier Ducrohet
bb72ae6b3e
am ad13b6b6: Set proper version of API 15 in SDK files.
...
* commit 'ad13b6b62fa911b8d5d4b5102b523658bc40f7c7':
Set proper version of API 15 in SDK files.
2011-12-08 14:42:52 -08:00
Xavier Ducrohet
ad13b6b62f
Set proper version of API 15 in SDK files.
...
Change-Id: I5d3a5dd6b9bf9b54f964f9188263109056e60796
2011-12-08 14:39:46 -08:00
Trevor Johns
a7819c1d3a
am 14d5943a: am 6c8a38a7: Merge "Issue #5689186 : Add Guava as a dependency for NFCDemo sample" into ics-mr0
...
* commit '14d5943a2f1197634c918fdfb565e62555848aaf':
Issue #5689186 : Add Guava as a dependency for NFCDemo sample
2011-12-01 16:21:22 -08:00
Trevor Johns
14d5943a2f
am 6c8a38a7: Merge "Issue #5689186 : Add Guava as a dependency for NFCDemo sample" into ics-mr0
...
* commit '6c8a38a780cbc0411ee6510f4c2b54c86e097edd':
Issue #5689186 : Add Guava as a dependency for NFCDemo sample
2011-12-01 16:19:14 -08:00
Trevor Johns
6c8a38a780
Merge "Issue #5689186 : Add Guava as a dependency for NFCDemo sample" into ics-mr0
2011-12-01 16:17:03 -08:00
Jesse Hall
74002735f5
am c08eaec1: am 96cd9c31: Merge "EmuGL: capture VBO contents in GL2Encoder" into ics-mr0
...
* commit 'c08eaec1e2d4f5bd9edc0fd764184b8095a4fce3':
EmuGL: capture VBO contents in GL2Encoder
2011-12-01 14:40:01 -08:00
Jesse Hall
c08eaec1e2
am 96cd9c31: Merge "EmuGL: capture VBO contents in GL2Encoder" into ics-mr0
...
* commit '96cd9c3130b6215534e863b94637b384da8102c9':
EmuGL: capture VBO contents in GL2Encoder
2011-12-01 14:37:51 -08:00
Jesse Hall
96cd9c3130
Merge "EmuGL: capture VBO contents in GL2Encoder" into ics-mr0
2011-12-01 14:36:02 -08:00
Chia-chi Yeh
f1a3d83db6
am 51cf4f22: am 9e1fdc96: Merge "Android VPN sample for ICS SDK" into ics-mr0
...
* commit '51cf4f22830e7b4e52278db0772692c6db5f327d':
Android VPN sample for ICS SDK
2011-12-01 14:06:28 -08:00
Chia-chi Yeh
51cf4f2283
am 9e1fdc96: Merge "Android VPN sample for ICS SDK" into ics-mr0
...
* commit '9e1fdc961cad3c403da3155ac64d912faa5e1bde':
Android VPN sample for ICS SDK
2011-12-01 14:04:11 -08:00
Chia-chi Yeh
9e1fdc961c
Merge "Android VPN sample for ICS SDK" into ics-mr0
2011-12-01 14:02:27 -08:00
Jesse Hall
7906431d04
EmuGL: capture VBO contents in GL2Encoder
...
The glBufferData, glBufferSubData, and glDeleteBuffers entry points
had interception routines in GL2Encoder which cache the data, but they
weren't hooked up. So when glDrawElements tried to retrieve the cached
data it wasn't there.
Change-Id: Iaed11fccaefab3186485be53a0f15c8ca0a255f9
2011-12-01 12:01:27 -08:00
Raphael Moll
8035e35ce6
am f0385cf8: am bd235021: SDK: fix script creating platform source archive.
...
* commit 'f0385cf8684aaebb6c03774a2aa9106f26472f6e':
SDK: fix script creating platform source archive.
2011-12-01 11:21:55 -08:00
Raphael Moll
f0385cf868
am bd235021: SDK: fix script creating platform source archive.
...
* commit 'bd235021675ba84b79173c0e02712fd838daef7e':
SDK: fix script creating platform source archive.
2011-12-01 11:20:01 -08:00
Raphael Moll
bd23502167
SDK: fix script creating platform source archive.
...
It turns out that the way I use Python to create ZIP
archives is plain wrong. Some files simply don't have the
right size and we get EOFException when unzipping with
Java's ZipFile.
This change adds a flag to instead simply copy all the
files we want and then run the 'zip' system command.
The python zip facility is left there intact in case
I want to go back and fix it later (I'm going to assume
it's my usage that's wrong before really blaming python).
Change-Id: Iea178a49be0bf23c91c01a2e036ae7a76def2b55
2011-11-30 22:39:29 -08:00
Svetoslav Ganov
09a36535f0
am eb178890: Merge " Adding a code sample for implementing accessibility in a custom view." into ics-mr1
...
* commit 'eb1788903298fc12ac800fe8fcfc6b7adec7b258':
Adding a code sample for implementing accessibility in a custom view.
2011-11-30 18:20:15 -08:00
Svetoslav Ganov
eb17889032
Merge " Adding a code sample for implementing accessibility in a custom view." into ics-mr1
2011-11-30 18:18:33 -08:00
Svetoslav Ganov
c844c4c138
am bdf03ad7: Updating the Monkey commands due to framework changes.
...
* commit 'bdf03ad735632ba585f53fea2e07d0e0c4973e20':
Updating the Monkey commands due to framework changes.
2011-11-30 17:54:58 -08:00
Svetoslav Ganov
bdf03ad735
Updating the Monkey commands due to framework changes.
...
bug:5664337
Change-Id: I7093fb8a646b9363dde6eee87955330bedec117b
2011-11-30 17:48:47 -08:00
Trevor Johns
f56101e2a3
Issue #5689186 : Add Guava as a dependency for NFCDemo sample
...
This adds Guava v10.0.1 as a dependency for development/samples/NFCDemo.
Without this, the sample does not build.
Also added a NOTICE file for NFCDemo to hold attribution for Guava.
Change-Id: I324e3984a2bd95d31be8d09bda3d2eb893edf831
2011-11-30 17:04:39 -08:00
Svetoslav Ganov
a75233833c
Adding a code sample for implementing accessibility in a custom view.
...
bug:5683532
Change-Id: I79471c431ba3aeb4abe57f850e84a4da0bc1feba
2011-11-29 13:02:58 -08:00
Chia-chi Yeh
9ad3f40880
Android VPN sample for ICS SDK
...
Change-Id: I84e568625c5c9cc9b48f338e2d6226a8e9f67017
2011-11-28 17:21:34 -08:00
Jean-Baptiste Queru
1676bcf489
am a96a7c60: am c4d810a4: Merge "Inaccvrate Morse data in sample code." into ics-mr0
...
* commit 'a96a7c6040f091777331745a4b31e2eb415a3a7a':
Inaccvrate Morse data in sample code.
2011-11-28 11:30:15 -08:00
Jean-Baptiste Queru
a96a7c6040
am c4d810a4: Merge "Inaccvrate Morse data in sample code." into ics-mr0
...
* commit 'c4d810a43ce5d052812a453b488ef0cc7511dfda':
Inaccvrate Morse data in sample code.
2011-11-28 11:28:45 -08:00
Jean-Baptiste Queru
c4d810a43c
Merge "Inaccvrate Morse data in sample code." into ics-mr0
2011-11-28 11:27:17 -08:00
Vladimir Chtchetkine
2e12af50c8
am c0353726: Merge "Cherry-picked from 6f00e7fc in master. Do not merge." into ics-mr1
...
* commit 'c03537267d9da2124cdbf68d896bacf88d94cca9':
Cherry-picked from 6f00e7fc in master. Do not merge.
2011-11-23 15:15:59 -08:00
Vladimir Chtchetkine
c03537267d
Merge "Cherry-picked from 6f00e7fc in master. Do not merge." into ics-mr1
2011-11-23 15:14:20 -08:00
Xavier Ducrohet
4c821ecabc
am 60381093: am 2400b2c3: Revert "Update the media_profiles.xml file to include..." do not merge.
...
* commit '603810939485089372245530fa3319dee850c776':
Revert "Update the media_profiles.xml file to include..." do not merge.
2011-11-23 14:42:45 -08:00
Xavier Ducrohet
6038109394
am 2400b2c3: Revert "Update the media_profiles.xml file to include..." do not merge.
...
* commit '2400b2c3402e6585437274f8acd5fd6e32367bb3':
Revert "Update the media_profiles.xml file to include..." do not merge.
2011-11-23 14:41:05 -08:00