LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,336 Commits 2 Branches 0 Tags
d0c00c8da42e16d583aa14fba6fb90a42f95f1ea
Commit Graph

10336 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xavier Ducrohet
8dec6e4d27 am cc003597: am 53973805: am 56259594: Merge "Move support lib to rev 6." into ics-mr1 
* commit 'cc0035973e182854476b00dff93df4a2226efd8c':
  Move support lib to rev 6.
 2011-12-13 05:47:48 -08:00
Dianne Hackborn
c6fb68b41e am 1bf05273: am 100dc50d: am 170b26ba: Merge "SDK only: add markup for use in documentation." into ics-mr1 
* commit '1bf05273dcdefd2ef139e167d0c097a9daf64398':
  SDK only: add markup for use in documentation.
 2011-12-13 05:47:37 -08:00
Jesse Hall
2982b9415d am fcc135f5: am 705c46ec: am 5d721ef6: am b0a30e43: EmuGL: remove broken EGL buffer refcounting 
* commit 'fcc135f554068d2101cc7d924268872c25c68bf8':
  EmuGL: remove broken EGL buffer refcounting
 2011-12-13 05:47:36 -08:00
The Android Open Source Project
1275c55fd6 am afe287f9: Reconcile with ics-mr1-release 
* commit 'afe287f9ce042241da7a8b88b5e4134555fcbc10':
 2011-12-13 05:40:52 -08:00
The Android Open Source Project
afe287f9ce Reconcile with ics-mr1-release 
Change-Id: I54bb077fa4b6424bd1c6da1e5b326194a78c6c05
 2011-12-13 05:11:38 -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
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
cc0035973e am 53973805: am 56259594: Merge "Move support lib to rev 6." into ics-mr1 
* commit '5397380528fdbb80e32094d1313d8ee308f8528c':
  Move support lib to rev 6.
 2011-12-12 18:01:24 -08:00
Dianne Hackborn
1bf05273dc am 100dc50d: am 170b26ba: Merge "SDK only: add markup for use in documentation." into ics-mr1 
* commit '100dc50d0b40330cb0e189653d1965ab1c20095b':
  SDK only: add markup for use in documentation.
 2011-12-12 17:49:32 -08:00
Jesse Hall
fcc135f554 am 705c46ec: am 5d721ef6: am b0a30e43: EmuGL: remove broken EGL buffer refcounting 
* commit '705c46ec3f5588e16511ae0e4239d310c85fecf8':
  EmuGL: remove broken EGL buffer refcounting
 2011-12-12 17:49:18 -08:00
Xavier Ducrohet
5397380528 am 56259594: Merge "Move support lib to rev 6." into ics-mr1 
* commit '56259594da620757e95172ef6ff68cade501da51':
  Move support lib to rev 6.
 2011-12-12 17:02:16 -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
100dc50d0b 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 16:10:57 -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
The Android Open Source Project
9d8b9d1a34 am 04206b6b: am caf0e6aa: Reconcile with ics-mr1-release 
* commit '04206b6bf1e0fbd4c7ddccefe8dd1e8c02a21aa9':
 2011-12-12 15:41:55 -08:00
Xavier Ducrohet
a052d9d866 am 82812f2c: am e66ffc14: am fed7d838: Move samples to API 15. 
* commit '82812f2c1f542a68d03ac577f51c6101b5503a44':
  Move samples to API 15.
 2011-12-12 15:41:49 -08:00
The Android Open Source Project
04206b6bf1 am caf0e6aa: Reconcile with ics-mr1-release 
* commit 'caf0e6aab57fe5e25fabc2aa485f44770678c816':
 2011-12-12 15:39:12 -08:00
Xavier Ducrohet
82812f2c1f am e66ffc14: am fed7d838: Move samples to API 15. 
* commit 'e66ffc1440e003eddb8b39cc335b41f345dc68c9':
  Move samples to API 15.
 2011-12-12 15:39:06 -08:00
Xavier Ducrohet
13425b5748 am 3161c0b5: am 60fe4a56: am 646e7964: Merge "Increase skin ram and vmheap." into ics-mr1 
* commit '3161c0b517998cdd829d80dee4db1b8d69ef3593':
  Increase skin ram and vmheap.
 2011-12-12 15:34:36 -08:00
James Dong
94c84ef711 am 8ec23d4a: am 23bb55d6: am 4fed461d: Revert "Revert "Update the media_profiles.xml file to include..." 
* commit '8ec23d4aeb8d5f96ff502033a0c700c4ca7524ea':
  Revert "Revert "Update the media_profiles.xml file to include..."
 2011-12-12 15:34:35 -08:00
Jean-Baptiste Queru
ebcfd936e6 am a6dd287a: am e1f412ff: am a98b9f28: Revert "Revert "Update the media_profiles.xml file to include..."" 
* commit 'a6dd287af9103f6b921a971c3bc2e83d1bb1f9d2':
  Revert "Revert "Update the media_profiles.xml file to include...""
 2011-12-12 15:34:34 -08:00
Bruno Oliveira
4220e11c4d am bbafd9c0: am efe10dd5: am 7e3475ca: am 4ea24bff: cherrypick from master cl Change-Id: I45f91fd9cfe0cb89789017deec63565e4757063e Adding the NewsReader sample. 
* commit 'bbafd9c0b6fd5238713c22048025d1cfcf56a353':
  cherrypick from master cl Change-Id: I45f91fd9cfe0cb89789017deec63565e4757063e Adding the NewsReader sample.
 2011-12-12 15:34:34 -08:00
The Android Open Source Project
1dfc9e647a am 2274559d: am 37cb2f70: Reconcile with ics-mr1-release 
* commit '2274559ded4f8dd764f77e0459adac85b9c1f02c':
 2011-12-12 15:34:33 -08:00
Xavier Ducrohet
3161c0b517 am 60fe4a56: am 646e7964: Merge "Increase skin ram and vmheap." into ics-mr1 
* commit '60fe4a56ddbb4b8bb8c5b058cdf854729a895cef':
  Increase skin ram and vmheap.
 2011-12-12 15:30:34 -08:00
James Dong
8ec23d4aeb am 23bb55d6: am 4fed461d: Revert "Revert "Update the media_profiles.xml file to include..." 
* commit '23bb55d60692accef0459e3683867b6b352cd9da':
  Revert "Revert "Update the media_profiles.xml file to include..."
 2011-12-12 15:30:30 -08:00
Jean-Baptiste Queru
a6dd287af9 am e1f412ff: am a98b9f28: Revert "Revert "Update the media_profiles.xml file to include..."" 
* commit 'e1f412ffa4fdd33462fb19c38564a20b354677e4':
  Revert "Revert "Update the media_profiles.xml file to include...""
 2011-12-12 15:30:22 -08:00
Bruno Oliveira
bbafd9c0b6 am efe10dd5: am 7e3475ca: am 4ea24bff: cherrypick from master cl Change-Id: I45f91fd9cfe0cb89789017deec63565e4757063e Adding the NewsReader sample. 
* commit 'efe10dd581677c2bd8e43df07e14bdd3f3a19139':
  cherrypick from master cl Change-Id: I45f91fd9cfe0cb89789017deec63565e4757063e Adding the NewsReader sample.
 2011-12-12 15:30:19 -08:00
The Android Open Source Project
2274559ded am 37cb2f70: Reconcile with ics-mr1-release 
* commit '37cb2f70392b95a3aa4f379b2e1f6baf1500af7b':
 2011-12-12 15:29:49 -08:00
Jesse Hall
705c46ec3f am 5d721ef6: am b0a30e43: EmuGL: remove broken EGL buffer refcounting 
* commit '5d721ef6a14dc22c6b44042f83f3a48ad68d05d4':
  EmuGL: remove broken EGL buffer refcounting
 2011-12-12 15:26:17 -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
David Hu
08deeecc46 am 73a6e6a3: am 68af4661: am 61cffb06: Merge "Change the test to user the listener mechanism" into ics-mr1 
* commit '73a6e6a3880b608e8d683b1ea65ad28d9ae029c7':
  Change the test to user the listener mechanism
 2011-12-12 13:37:58 -08:00
Xavier Ducrohet
3b21770d67 am 761d03bd: am f354d727: (-s ours) am ad13b6b6: Set proper version of API 15 in SDK files. 
* commit '761d03bd377737d809d67dfca593b087927c2308':
  Set proper version of API 15 in SDK files.
 2011-12-12 13:37:58 -08:00
David Hu
73a6e6a388 am 68af4661: am 61cffb06: Merge "Change the test to user the listener mechanism" into ics-mr1 
* commit '68af4661b0c611a3303ff4e32ffd1659d45e5b02':
  Change the test to user the listener mechanism
 2011-12-12 12:35:13 -08:00
Xavier Ducrohet
761d03bd37 am f354d727: (-s ours) am ad13b6b6: Set proper version of API 15 in SDK files. 
* commit 'f354d7271475405aec6d53cf8ba5622a4a8af944':
  Set proper version of API 15 in SDK files.
 2011-12-12 12:34:48 -08:00
The Android Open Source Project
caf0e6aab5 Reconcile with ics-mr1-release 
Change-Id: Ie919f6cfc9ec35f4abffd16fadd0dcf3fe0e0e6f
 2011-12-12 06:50:19 -08:00
Xavier Ducrohet
e66ffc1440 am fed7d838: Move samples to API 15. 
* commit 'fed7d838d0b4eec94bd2d5910fa496bd1849052e':
  Move samples to API 15.
 2011-12-09 16:36:37 -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
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
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
60fe4a56dd am 646e7964: Merge "Increase skin ram and vmheap." into ics-mr1 
* commit '646e7964f94f0ba55f67e91996009833b2dd0ead':
  Increase skin ram and vmheap.
 2011-12-09 15:43:47 -08:00
Xavier Ducrohet
646e7964f9 Merge "Increase skin ram and vmheap." into ics-mr1 2011-12-09 15:42:26 -08:00