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

8419 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
891a37fba3 am 8377ab2a: am f30b1b88: Reconcile with ics-mr1-release 
* commit '8377ab2a84bec31e41e0799c2eff7224a9680167':
 2011-12-09 15:01:00 -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
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
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
Tor Norbye
5da74d00ab am 7fb8be5c: Update mkstubs from ASM 3.1 to ASM 4.0 
* commit '7fb8be5c6ab69d547a49da88093c57acc3694309':
  Update mkstubs from ASM 3.1 to ASM 4.0
 2011-12-06 13:33:47 -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
The Android Open Source Project
fa1a2b2e1c am 629fb72e: Reconcile with ics-mr1-release 
* commit '629fb72e6f4a6d93093d96215f5b7274a6a3a308':
 2011-12-05 08:54:26 -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
39664cd93a merge in ics-mr1-release history after reset to ics-mr1 2011-12-02 10:24:21 -08:00
The Android Open Source Project
1a87532f41 am d212535e: Reconcile with ics-mr1-release 
* commit 'd212535e871611d5bac4a822af04e785b55e6d14':
 2011-12-02 07:54:49 -08:00
The Android Open Source Project
d212535e87 Reconcile with ics-mr1-release 
Change-Id: I65fa0ab7a8aa7c6bc0f065618a5ca1c05e318332
 2011-12-02 07:52:59 -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
b235dbda06 am d63fbbed: am ee34239f: am 14d5943a: am 6c8a38a7: Merge "Issue #5689186: Add Guava as a dependency for NFCDemo sample" into ics-mr0 
* commit 'd63fbbedfd65e9fa52ed12a9103d776508f2a614':
  Issue #5689186: Add Guava as a dependency for NFCDemo sample
 2011-12-01 16:24:01 -08:00
Trevor Johns
d63fbbedfd am ee34239f: am 14d5943a: am 6c8a38a7: Merge "Issue #5689186: Add Guava as a dependency for NFCDemo sample" into ics-mr0 
* commit 'ee34239f57fd3e6357ab5ed6021cd0a146f5650b':
  Issue #5689186: Add Guava as a dependency for NFCDemo sample
 2011-12-01 16:22:19 -08:00
Trevor Johns
ee34239f57 am 14d5943a: am 6c8a38a7: Merge "Issue #5689186: Add Guava as a dependency for NFCDemo sample" into ics-mr0 
* commit '14d5943a2f1197634c918fdfb565e62555848aaf':
  Issue #5689186: Add Guava as a dependency for NFCDemo sample
 2011-12-01 16:20:23 -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
2e4b82fe04 am 90fbc9f9: am f1e2c7f6: am c08eaec1: am 96cd9c31: Merge "EmuGL: capture VBO contents in GL2Encoder" into ics-mr0 
* commit '90fbc9f905fc5c68701a4fb30a7f65cbc0b7bd01':
  EmuGL: capture VBO contents in GL2Encoder
 2011-12-01 14:43:27 -08:00
Jesse Hall
90fbc9f905 am f1e2c7f6: am c08eaec1: am 96cd9c31: Merge "EmuGL: capture VBO contents in GL2Encoder" into ics-mr0 
* commit 'f1e2c7f699995f5554764e82495b73ccbdf83a61':
  EmuGL: capture VBO contents in GL2Encoder
 2011-12-01 14:41:47 -08:00
Jesse Hall
f1e2c7f699 am c08eaec1: am 96cd9c31: Merge "EmuGL: capture VBO contents in GL2Encoder" into ics-mr0 
* commit 'c08eaec1e2d4f5bd9edc0fd764184b8095a4fce3':
  EmuGL: capture VBO contents in GL2Encoder
 2011-12-01 14:40:01 -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
0472e792f2 am 225cdf76: am cd4db913: am 51cf4f22: am 9e1fdc96: Merge "Android VPN sample for ICS SDK" into ics-mr0 
* commit '225cdf76c5837ffe92fb1beca0521c5d5c252847':
  Android VPN sample for ICS SDK
 2011-12-01 14:09:33 -08:00
Chia-chi Yeh
225cdf76c5 am cd4db913: am 51cf4f22: am 9e1fdc96: Merge "Android VPN sample for ICS SDK" into ics-mr0 
* commit 'cd4db913a8aa4b99cdb95930f84d3edbefd1f61f':
  Android VPN sample for ICS SDK
 2011-12-01 14:08:00 -08:00
Chia-chi Yeh
cd4db913a8 am 51cf4f22: am 9e1fdc96: Merge "Android VPN sample for ICS SDK" into ics-mr0 
* commit '51cf4f22830e7b4e52278db0772692c6db5f327d':
  Android VPN sample for ICS SDK
 2011-12-01 14:06:11 -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
Raphael Moll
9f2ac115c3 am dd652afd: resolved conflicts for merge of ac0ad7e7 to master 
* commit 'dd652afd50cd4104da39edea29e2e3d4e16da18e':
  SDK: fix script creating platform source archive.
 2011-12-01 12:17:40 -08:00
Raphael Moll
dd652afd50 resolved conflicts for merge of ac0ad7e7 to master 
Change-Id: I2a17f6702a9577d61044c99a4648d8bcf5b3d7fa
 2011-12-01 12:13:12 -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