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

8620 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
Xavier Ducrohet
7400b43b8c Increase skin ram and vmheap. 
Change-Id: I96d8f6249ab7110717f21cd339acd8a803a579d3
 2011-12-09 15:41:45 -08:00
The Android Open Source Project
8377ab2a84 am f30b1b88: Reconcile with ics-mr1-release 
* commit 'f30b1b886a4212656497145fd621376b5380ca28':
 2011-12-09 14:57:26 -08:00
James Dong
23bb55d606 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 14:44:07 -08:00
Jean-Baptiste Queru
e1f412ffa4 am a98b9f28: Revert "Revert "Update the media_profiles.xml file to include..."" 
* commit 'a98b9f28b1b3f426b47956801033d748507576d6':
  Revert "Revert "Update the media_profiles.xml file to include...""
 2011-12-09 13:45:29 -08:00
Jean-Baptiste Queru
a98b9f28b1 Revert "Revert "Update the media_profiles.xml file to include..."" 
This reverts commit 2400b2c340.

Change-Id: I017f4a212ff34478e498513a6b8c0da2e7c0f27e
 2011-12-09 13:13:25 -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
efe10dd581 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:08:52 -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 Open Source Project
37cb2f7039 Reconcile with ics-mr1-release 
Change-Id: Id14659aa3dbffa87ea06ccdf81455c9e83cd9192
 2011-12-09 07:10:46 -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
68af4661b0 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:39:49 -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
f354d72714 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:29 -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 Open Source Project
f30b1b886a Reconcile with ics-mr1-release 
Change-Id: If71e2c395991615099e415e9871bce1e8910b5c2
 2011-12-08 10:21:28 -08:00
The Android Automerger
b1f54a55c9 merge in ics-release history after reset to master 2011-12-07 06:59:25 -08:00
Tor Norbye
7fb8be5c6a Update mkstubs from ASM 3.1 to ASM 4.0 
Change-Id: If43fcdba7070af8ae3d72e7e30a1dcbe11a217ec
 2011-12-05 14:30:02 -08:00
Vladimir Chtchetkine
031b92f4c7 Pass white balance and exposure compensation to webcam emulator 
Using fake camera implementation for WB/exposure, implement the same functionality
on frames comming from webcam emulator. Note that due to heavy computations that
are involved in implementing this, we will do all that math in the emulator
application in order to provide a decent performance.

Change-Id: Id6c37b472860674c91e6ca37522fc61f497515a3
 2011-12-05 09:16:23 -08:00
The Android Open Source Project
629fb72e6f Reconcile with ics-mr1-release 
Change-Id: I038f5d340276fc8b7498e3cb375ac1ece2d6917c
 2011-12-05 08:52:55 -08:00
The Android Automerger
546a1303b3 merge in ics-release history after reset to master 2011-12-05 06:59:29 -08:00