LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,353 Commits 2 Branches 0 Tags
c85a73bf281bd96510334d413845da99af31b54c
Commit Graph

8353 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Ly
7a98345fc5 updating the SampleSyncAdapter sample to add stream item and photo code 
Change-Id: I6d44ea3f912a3d1e52695bda785c81ff527160d5
 2012-01-19 14:51:23 -08:00
Dianne Hackborn
2a9de0211d Clean up and extend the linkify sample. 
Change-Id: If9d0451af3bfcdcd8bafb325f4b7978857efab7e
 2012-01-13 14:00:01 -08:00
The Android Automerger
c9011c7f3c merge in ics-mr1-release history after reset to ics-mr1 2012-01-12 14:00:47 -08:00
Jesse Hall
4f66a14d53 Merge "EmuGL: handle NULL data in glBufferData" into ics-mr1 2012-01-11 17:10:35 -08:00
Xavier Ducrohet
a318515c0d Merge "Move platform 15 sdk rev to 2. do not merge." into ics-mr1 2012-01-11 17:08:47 -08:00
Xavier Ducrohet
e4627619b3 Move platform 15 sdk rev to 2. do not merge. 
Change-Id: I8c3ab6cce4305afcd380b23ed0638169676d5d97
 2012-01-11 17:08:18 -08:00
The Android Automerger
c8b86c1add merge in ics-mr1-release history after reset to ics-mr1 2012-01-11 16:28:10 -08:00
Katie McCormick
e065fd6209 Merge "Doc change: updated index page for HDP sample." into ics-mr1 2012-01-11 16:02:50 -08:00
Jesse Hall
5bad48a65e EmuGL: handle NULL data in glBufferData 
The data pointer argument to glBufferData can be NULL; this
[re]allocates the buffer while leaving the contents undefined.

Bug: 5833436

Change-Id: Ia1ddf62e2cd2c59d3d631e01d23d7c557ca5a52e
 2012-01-11 15:40:29 -08:00
Dianne Hackborn
0b6b4f2d19 Merge "Fix notification sample to follow current UI guidelines." into ics-mr1 2012-01-11 10:53:25 -08:00
Dianne Hackborn
174f61c0e9 Fix notification sample to follow current UI guidelines. 
Lots of clean up on the messaging notification sample to show the real
correct way to do things.  Also mark up a bunch of the sample for use
in the documentation.

Change-Id: I3a29a944c2971e142c33b29aff94b1ba0b40ae0e
 2012-01-10 15:53:32 -08:00
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
The Android Automerger
0bd79f4b43 merge in ics-mr1-release history after reset to ics-mr1 2012-01-06 16:31:26 -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
The Android Automerger
6baffbb74b merge in ics-mr1-release history after reset to ics-mr1 2012-01-04 16:41:23 -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
The Android Automerger
1fd9450082 merge in ics-mr1-release history after reset to ics-mr1 2011-12-20 17:26:25 -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
The Android Automerger
26a63bc183 merge in ics-mr1-release history after reset to ics-mr1 2011-12-16 12:01:28 -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
The Android Automerger
c30c3a4192 merge in ics-mr1-release history after reset to ics-mr1 2011-12-13 16:02:26 -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
The Android Automerger
16ac19efd5 merge in ics-mr1-release history after reset to ics-mr1 2011-12-12 22:08:10 -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
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