Commit Graph

8362 Commits

Author SHA1 Message Date
Xavier Ducrohet
4a6b52bc98 Move support lib to rev 6.
Change-Id: Iad48f3d8b7d8399df4286f2a8995a079797d25ea
2011-12-12 17:00:09 -08:00
Scott Main
442088151c revisions to NewsReader sample app for AndroidU.
Clean up XML markup for clean rendering in HTML docs;
Change string resources for two-pane mode to bools;
Rename resource files w/ layout info from main.xml to layouts.xml.
Add support lib
Add HTML page

Change-Id: I88fc5cedb8f11dae9de019ba75593de2027de231
2011-12-12 16:28:27 -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
fed7d838d0 Move samples to API 15.
Change-Id: I70a065033ad157ca15cddf56e81c631c301854a0
2011-12-09 16:34:20 -08:00
The Android Automerger
199457d930 merge in ics-mr1-release history after reset to ics-mr1 2011-12-09 16:15:46 -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
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
The Android Automerger
a4479fade6 merge in ics-mr1-release history after reset to ics-mr1 2011-12-08 17:34:31 -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
ad13b6b62f Set proper version of API 15 in SDK files.
Change-Id: I5d3a5dd6b9bf9b54f964f9188263109056e60796
2011-12-08 14:39:46 -08:00
The Android Automerger
39664cd93a merge in ics-mr1-release history after reset to ics-mr1 2011-12-02 10:24:21 -08:00
The Android Automerger
21d09352f5 merge in ics-mr1-release history after reset to ics-mr1 2011-12-01 16:45:14 -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
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
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
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
The Android Automerger
00ba25e157 merge in ics-mr1-release history after reset to ics-mr1 2011-12-01 06:45:37 -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
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
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
The Android Automerger
4ae2c7e15f merge in ics-mr1-release history after reset to ics-mr1 2011-11-28 12:21:41 -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
c03537267d Merge "Cherry-picked from 6f00e7fc in master. Do not merge." into ics-mr1 2011-11-23 15:14:20 -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
Xavier Ducrohet
2400b2c340 Revert "Update the media_profiles.xml file to include..." do not merge.
This reverts commit a8fe85ea64.
2011-11-23 14:36:58 -08:00
Xavier Ducrohet
2d003a274d am 2310657c: Move support lib to rev 5.
* commit '2310657c422924ef91a845d16e562acf10bc2797':
  Move support lib to rev 5.
2011-11-23 14:04:31 -08:00
James Dong
d2c0b7d4ac am a8fe85ea: Update the media_profiles.xml file to include maximum memory usage support for video editor. do not merge.
* commit 'a8fe85ea64b82cdee7ba0ec4d3d2a211da8c24f4':
  Update the media_profiles.xml file to include maximum memory usage support for video editor. do not merge.
2011-11-23 14:04:30 -08:00
Vladimir Chtchetkine
9a1a290e58 am fd1bdd61: Update supported frame sizes for fake camera. do not merge.
* commit 'fd1bdd611a2954bfb171548b8fa288b0319a0aa9':
  Update supported frame sizes for fake camera. do not merge.
2011-11-23 14:04:29 -08:00
Xavier Ducrohet
2310657c42 Move support lib to rev 5.
Change-Id: I8163752e9913cdadd0d17a1ec2bbf6b8e7efa9ae
2011-11-23 14:01:59 -08:00
James Dong
a8fe85ea64 Update the media_profiles.xml file to include maximum memory usage support for video editor. do not merge.
related-to-bug: 5625690

(cherry picked from commit f8781452d9)

Change-Id: Id27eb9052f00328ba04bac8486c9ed23f3c6a09b
2011-11-23 13:14:50 -08:00
Vladimir Chtchetkine
fd1bdd611a Update supported frame sizes for fake camera. do not merge.
Camera framework requires 352x288, and 320x240 frames for video preview and video
recording. If these dimensions are missing in camera properties the camera app
may abort when entering video mode, or start video recording.

Also truned off switching fake frames, leaving only the checker board.

(cherry picked from commit 6f00e7fc48)

Change-Id: Ic50225e1700ea3b04ae5445549548f2ffe4ae2df
2011-11-23 13:14:16 -08:00
Jean-Baptiste Queru
cf2051ab22 Inaccvrate Morse data in sample code.
This vses the trve seqvence, svch that vsers can be
vnderstood vpon revsing this data, thvs bypassing
svrprising qvestions.

Change-Id: I1741d0c4072ab43975981799f602a6a6cda25088
2011-11-23 08:14:10 -08:00
Vladimir Chtchetkine
4d9806f561 Cherry-picked from 6f00e7fc in master. Do not merge.
Update supported frame sizes for fake camera

Camera framework requires 352x288, and 320x240 frames for video preview and video
recording. If these dimensions are missing in camera properties the camera app
may abort when entering video mode, or start video recording.

Also truned off switching fake frames, leaving only the checker board.

Change-Id: I63d145c967f1ba83992141ec97700f094a9d53a7
2011-11-23 06:51:53 -08:00
Jesse Hall
3a655154d0 am af4f66be: EmuGL: implement OES_EGL_image_external for GLESv1
* commit 'af4f66be50b17c8b8fce1dda53389bb0a10968ba':
  EmuGL: implement OES_EGL_image_external for GLESv1
2011-11-22 15:43:26 -08:00
Jesse Hall
25902c0540 am f37a7ed6: GLES translator: don\'t delete EGLImage textures
* commit 'f37a7ed6c5c609a3afc33f81bf50893362917ae6':
  GLES translator: don't delete EGLImage textures
2011-11-22 15:37:32 -08:00
Jesse Hall
f25dc0f673 am faaf1553: EmuGL: set texture info from EGLImage
* commit 'faaf1553cfa39c23ceb198ba7edbd46ff3a11f7a':
  EmuGL: set texture info from EGLImage
2011-11-22 15:37:31 -08:00