LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,402 Commits 2 Branches 0 Tags
08f4a2848e4d546b699e68adc268e9ea9701c88a
Commit Graph

9402 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xavier Ducrohet
bb72ae6b3e 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:52 -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
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
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
a7819c1d3a 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:21:22 -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
74002735f5 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
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
f1a3d83db6 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:28 -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
Raphael Moll
8035e35ce6 am f0385cf8: am bd235021: SDK: fix script creating platform source archive. 
* commit 'f0385cf8684aaebb6c03774a2aa9106f26472f6e':
  SDK: fix script creating platform source archive.
 2011-12-01 11:21:55 -08:00
Raphael Moll
ac0ad7e7eb am f0385cf8: am bd235021: SDK: fix script creating platform source archive. 
* commit 'f0385cf8684aaebb6c03774a2aa9106f26472f6e':
  SDK: fix script creating platform source archive.
 2011-12-01 11:21:28 -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
The Android Automerger
00ba25e157 merge in ics-mr1-release history after reset to ics-mr1 2011-12-01 06:45:37 -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
4f74cbaf19 am 15ee96f1: Fising the build 
* commit '15ee96f1d552c04b240b53212209b2cc678d2f50':
  Fising the build
 2011-11-30 19:54:51 -08:00
Svetoslav Ganov
15ee96f1d5 Fising the build 
Change-Id: I3bbc77a2ad4244076df01071c1093f969c9dd4e4
 2011-11-30 19:37:55 -08:00
Svetoslav Ganov
2137d172d7 am cf0a1987: resolved conflicts for merge of cb0d49cd to master 
* commit 'cf0a198756b4b320a03886b09c8f29db46b3b4af':
  Adding a code sample for implementing accessibility in a custom view.
 2011-11-30 18:59:50 -08:00
Svetoslav Ganov
cf0a198756 resolved conflicts for merge of cb0d49cd to master 
Change-Id: I0eabcb7b55a0b10f50e2e1f065213223b5600aab
 2011-11-30 18:53:19 -08:00
Svetoslav Ganov
ed3a61ab6e am 64696acd: resolved conflicts for merge of cd362a83 to master 
* commit '64696acdd289b55dbcad6901025d11e57e123dd4':
  Updating the Monkey commands due to framework changes.
 2011-11-30 18:49:46 -08:00
Svetoslav Ganov
64696acdd2 resolved conflicts for merge of cd362a83 to master 
Change-Id: I64ce155422530815d2f8deeb4f901c0920f6e68b
 2011-11-30 18:45:11 -08:00
Svetoslav Ganov
09a36535f0 am eb178890: Merge " Adding a code sample for implementing accessibility in a custom view." into ics-mr1 
* commit 'eb1788903298fc12ac800fe8fcfc6b7adec7b258':
  Adding a code sample for implementing accessibility in a custom view.
 2011-11-30 18:20:15 -08:00
Svetoslav Ganov
cb0d49cd74 am eb178890: Merge " Adding a code sample for implementing accessibility in a custom view." into ics-mr1 
* commit 'eb1788903298fc12ac800fe8fcfc6b7adec7b258':
  Adding a code sample for implementing accessibility in a custom view.
 2011-11-30 18:20:12 -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
c844c4c138 am bdf03ad7: Updating the Monkey commands due to framework changes. 
* commit 'bdf03ad735632ba585f53fea2e07d0e0c4973e20':
  Updating the Monkey commands due to framework changes.
 2011-11-30 17:54:58 -08:00
Svetoslav Ganov
cd362a83bf am bdf03ad7: Updating the Monkey commands due to framework changes. 
* commit 'bdf03ad735632ba585f53fea2e07d0e0c4973e20':
  Updating the Monkey commands due to framework changes.
 2011-11-30 17:54:49 -08:00