Commit Graph

8289 Commits

Author SHA1 Message Date
Jesse Hall
f0baef2fed Merge "EmuGL: misc small cleanups" into ics-mr1 2012-01-09 15:52:15 -08:00
Jesse Hall
409c49c526 Merge "EmuGL: fix GL view position in window on OS X" into ics-mr1 2012-01-09 15:51:40 -08:00
Katie McCormick
f741c05f0c Doc change: updated index page for HDP sample.
Change-Id: I06a6af5bdfac9a260ca053dd11030631e49c2509
2012-01-06 12:45:32 -08:00
Roman Nurik
5621efe11c docs: Allow d.a.c. to serve .OGV
This is necessary for HTML5 video in Firefox.

Change-Id: Ifcc39c338db64aa6c05418c1f3235bda62081f9b
2012-01-05 16:32:03 -08:00
Jesse Hall
a592d9c043 EmuGL: misc small cleanups
* Disable verbose debug spam.
* Add missing GL enum to utility function. The default case was
  returning the correct size, so this doesn't fix any bugs, just
  removes some logcat spam.
* Comment and whitespace corrections.

Change-Id: I83fb8644331ae1072d6a8dae9c041da92073089f
2012-01-05 10:50:01 -08:00
Jesse Hall
a4fb8a60b1 EmuGL: fix GL view position in window on OS X
The code that creates the GL-accelerated screen view wasn't converting
the upper-left-relative coordinates used within the emulator to the
lower-left coordinates used by the Cocoa APIs on OS X. Since most
skins have the screen view centered vertically this often just
happened to work.

Bug: 5782118
Change-Id: I2f96ee181e850df5676d10a82d86c94421149b40
2012-01-04 15:03:39 -08:00
Roman Nurik
9fe60c34a4 Allow d.a.c to serve webm and mp4
Change-Id: I8c127642ee8bbeb5eda2cae0aaf2d0e902492a7a
2011-12-22 16:44:39 -08:00
Roman Nurik
93d610d59a DO NOT MERGE Cherrypick from master: Allow d.a.c. to serve SVG files
Change-Id: I6d13b21bdafa70ea19d14a95b65476ba7c037d8c
2011-12-20 11:12:35 -08:00
Xavier Ducrohet
dc6a269f82 Merge commit '71c1d3d8' into MR1 using -s ours
Change-Id: I392ab7665f40f9c273f8d0f837597f1bd6c9d135
2011-12-15 15:52:09 -08:00
Xavier Ducrohet
71c1d3d864 Move platform component to rev3. do not merge.
Change-Id: I21157462faf12322112244d13390592e24529748
2011-12-15 14:53:40 -08:00
Xavier Ducrohet
c3a7688651 am 2d954623: Fix WXGA720 skin to be portrait by default. do not merge.
* commit '2d95462334a254a6d1aedbc431e19fdb2bb2a0e6':
  Fix WXGA720 skin to be portrait by default. do not merge.
2011-12-15 14:41:12 -08:00
Xavier Ducrohet
2d95462334 Fix WXGA720 skin to be portrait by default. do not merge.
Having it landscape by default is not representative of a phone
and triggers an issue where the system ui bar is not displayed.

(cherry picked from commit 144589bfd0)

Change-Id: I67398ff618ac76da4ec02d1d2e518a8f7618b0fa
2011-12-15 14:38:56 -08:00
Xavier Ducrohet
31ecada2ee Merge "Fix WXGA720 skin to be portrait by default." into ics-mr1 2011-12-15 14:31:16 -08:00
Xavier Ducrohet
144589bfd0 Fix WXGA720 skin to be portrait by default.
Having it landscape by default is not representative of a phone
and triggers an issue where the system ui bar is not displayed.

Change-Id: Ic28e3739c30825fe55f8cc6cede5c9a5462f6931
2011-12-15 14:28:46 -08:00
Scott Main
cbfbaee25e am e9747521: Merge "Sample code for Android U lesson: Monetization - Ads without Compromising User Experience." into ics-mr0
* commit 'e97475210ab07f0e49b14d267027ab03a68d1099':
  Sample code for Android U lesson: Monetization - Ads without Compromising User Experience.
2011-12-15 10:15:11 -08:00
Scott Main
335151a356 am d46d8577: Merge "Sample app for Android U lesson: Building apps for enterprise - Device administration." into ics-mr0
* commit 'd46d8577a8cf5ed96c01a70442380910016cdbe2':
  Sample app for Android U lesson: Building apps for enterprise - Device administration.
2011-12-15 10:15:09 -08:00
Scott Main
e97475210a Merge "Sample code for Android U lesson: Monetization - Ads without Compromising User Experience." into ics-mr0 2011-12-15 10:12:19 -08:00
Scott Main
d46d8577a8 Merge "Sample app for Android U lesson: Building apps for enterprise - Device administration." into ics-mr0 2011-12-15 10:11:55 -08:00
Fred Chung
b9c12ba27b Sample app for Android U lesson: Building apps for enterprise - Device administration.
Change-Id: Ie4fbc26be45c32d19a94faed68d9f4070a96c1d7
2011-12-14 20:08:51 -08:00
Fred Chung
df52a4cafe Sample code for Android U lesson: Monetization - Ads without Compromising User Experience.
Change-Id: I6b077c24f71c00e99fe6e15da127b02707ad57f3
2011-12-13 15:39:35 -08:00
Scott Main
a56010682a am 514d1cdb: Merge "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 p
* commit '514d1cdb04594d418828f0c6ec642cb180608198':
  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
2011-12-13 13:10:41 -08:00
Scott Main
514d1cdb04 Merge "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" into ics-mr0 2011-12-13 10:25:23 -08:00
Raphael
476edbaae4 Merge "SDK: package fastboot in platform-tools on 3 OSes." Do not merge.
SDK Bug: 21115

(cherry picked from commit 94a55ddf0b)

Change-Id: I7c61bd171d85a52fdb0ac21bd2861f3d474eb4dc
2011-12-12 22:08:12 -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
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
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
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
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
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