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
Roman Nurik
373407653a am 5621efe1: docs: Allow d.a.c. to serve .OGV 
* commit '5621efe11cda8a885adc335f48b4d0c25ceb6f32':
  docs: Allow d.a.c. to serve .OGV
 2012-01-05 16:38:48 -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
Steve Block
cb46eed1eb am 91cb6de5: Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE" 
* commit '91cb6de5e5c862ad25c4b494a27716e2bf9e697f':
  Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)  DO NOT MERGE
 2012-01-05 14:09:15 -08:00
Steve Block
91cb6de5e5 Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE" 2012-01-05 14:06:36 -08:00
The Android Open Source Project
a140db8fa5 am 0a63c4c2: am 5225c6fb: Reconcile with ics-mr1-release 
* commit '0a63c4c2af49ef149058253e164b4ea2bcd3ffef':
 2012-01-05 12:12:58 -08:00
The Android Open Source Project
0a63c4c2af am 5225c6fb: Reconcile with ics-mr1-release 
* commit '5225c6fb52c1628f8bd014c3c9a0c2b87f192dab':
 2012-01-05 12:08:36 -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 Open Source Project
5225c6fb52 Reconcile with ics-mr1-release 
Change-Id: I9836cd02d0be2bacef2f68cddb621e41f693b84f
 2012-01-05 07:45:18 -08:00
David 'Digit' Turner
98f56b100c ndk: disable logs in release builds of native_app_glue library. 
This patch disables all the logs from the 'native_app_glue' helper
library (used to implement native activities with the NDK), unless
you're building a debug build.

Change-Id: Iaad9d7c48a392ec119704074ab76e131d7806adb
 2012-01-05 16:41:09 +01:00
The Android Automerger
27a95d564d merge in ics-release history after reset to master 2012-01-05 06:59:22 -08:00
Jason Sams
c21692d09b Merge "Fix headers" into graphics-dev 2012-01-04 17:50:52 -08:00
Jason Sams
fc2aded9ce Fix headers 
Change-Id: I74832252a5fc0fdc543c29ac1a85ce39a97b2821
 2012-01-04 17:48:54 -08:00
Alex Sakhartchouk
185bb9b5cc Merge "Stripping out geometry data, but keeping names and references instead of removing all geometric data." into graphics-dev 2012-01-04 17:18:44 -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
Steve Block
cad4194fad Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE 
See https://android-git.corp.google.com/g/156801

Bug: 5449033
Change-Id: Ia7ba0ca669b2c4168d90837f9b409b21503f95f0
 2012-01-04 21:08:55 +00:00
Steve Block
7ee245378c am 112bc5e5: Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE 
* commit '112bc5e57e206ec3e0bc5a335b62eae2eb8892e8':
  Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)  DO NOT MERGE
 2012-01-04 10:16:05 -08:00
Alex Sakhartchouk
40b0530285 Stripping out geometry data, but keeping names and references instead 
of removing all geometric data.

Change-Id: I602d548f6ef41b9feba3b50b819501c3d59bf8c6
 2012-01-03 17:39:38 -08:00
Steve Block
112bc5e57e Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE 
See https://android-git.corp.google.com/g/156016

Bug: 5449033
Change-Id: Ia14c98936bb1dc74e681bf2de342ad6861646778
 2012-01-03 22:29:55 +00:00
The Android Automerger
a017c493e0 merge in ics-release history after reset to master 2012-01-03 06:59:16 -08:00
Roman Nurik
48fdd9e2d3 am dcea17d0: am 149663fe: am 9fe60c34: Allow d.a.c to serve webm and mp4 
* commit 'dcea17d0509ce51de71ce497b4ce990c29f341a3':
  Allow d.a.c to serve webm and mp4
 2012-01-02 11:29:14 -08:00
Roman Nurik
dcea17d050 am 149663fe: am 9fe60c34: Allow d.a.c to serve webm and mp4 
* commit '149663fe76f8c91021599916150e0e790063cfea':
  Allow d.a.c to serve webm and mp4
 2012-01-02 11:27:12 -08:00
Roman Nurik
9454c5bc6e am 9fe60c34: Allow d.a.c to serve webm and mp4 
* commit '9fe60c34a49c0be4d5014fb0e056959b4683304e':
  Allow d.a.c to serve webm and mp4
 2012-01-02 11:25:43 -08:00
Roman Nurik
149663fe76 am 9fe60c34: Allow d.a.c to serve webm and mp4 
* commit '9fe60c34a49c0be4d5014fb0e056959b4683304e':
  Allow d.a.c to serve webm and mp4
 2012-01-02 11:25:41 -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
f3b36dca1c merge in ics-release history after reset to master 2011-12-22 06:59:20 -08:00
Al Sutton
3d9ff5598c am c9cfb303: am 34e3d029: am 87879839: Fix build on MacOS 10.7 / XCode 4 
* commit 'c9cfb3032d5d4a502011fb30c344c73a35003b93':
  Fix build on MacOS 10.7 / XCode 4
 2011-12-21 16:51:09 -08:00
Al Sutton
c9cfb3032d am 34e3d029: am 87879839: Fix build on MacOS 10.7 / XCode 4 
* commit '34e3d0291b767807e55022688463bdef96569462':
  Fix build on MacOS 10.7 / XCode 4
 2011-12-21 16:48:26 -08:00
Al Sutton
34e3d0291b am 87879839: Fix build on MacOS 10.7 / XCode 4 
* commit '87879839f19faaa30577435842294edf3e562f66':
  Fix build on MacOS 10.7 / XCode 4
 2011-12-21 16:47:05 -08:00
Al Sutton
87879839f1 Fix build on MacOS 10.7 / XCode 4 
Ensure the dynamic library library gets linked in with SDL
to fix compilation errors

Change-Id: I32e6929088eaf73d707e89d10392c658b58ec465
 2011-12-21 13:21:32 -08:00
The Android Open Source Project
83dd8d7e63 am e8fa72b3: am 0f967c02: Reconcile with ics-mr1-release 
* commit 'e8fa72b3fa0acff025d46b75a23a3a8a19e9a4f5':
 2011-12-21 07:23:35 -08:00
The Android Open Source Project
e8fa72b3fa am 0f967c02: Reconcile with ics-mr1-release 
* commit '0f967c02c113c62f17f3f3c93164269fb5818a36':
 2011-12-21 07:21:39 -08:00
The Android Open Source Project
0f967c02c1 Reconcile with ics-mr1-release 
Change-Id: Ibedde76d39b336b7a11b3793d824a3a4f933bf30
 2011-12-21 07:19:15 -08:00
The Android Automerger
d4ec7a5ede merge in ics-release history after reset to master 2011-12-21 06:59:30 -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
The Android Open Source Project
1146d4a56d am 1f3abd2b: am c49f7610: Reconcile with ics-mr1-release 
* commit '1f3abd2b7b7890d310fd91236f0319859f8beb12':
 2011-12-20 13:13:15 -08:00
The Android Open Source Project
1f3abd2b7b am c49f7610: Reconcile with ics-mr1-release 
* commit 'c49f76108a615121615e290e2e4e19b59c4cf086':
 2011-12-20 13:09:53 -08:00
The Android Open Source Project
c49f76108a Reconcile with ics-mr1-release 
Change-Id: Ibafcd77c519fede8a61087378f6d842decd285bb
 2011-12-20 13:08:27 -08:00
Roman Nurik
cc6d67ccc1 am 6e593782: am c38d511a: (-s ours) am 93d610d5: DO NOT MERGE Cherrypick from master: Allow d.a.c. to serve SVG files 
* commit '6e593782d1f990725f1d194109da1d6940e89f8f':
  DO NOT MERGE Cherrypick from master: Allow d.a.c. to serve SVG files
 2011-12-20 12:08:10 -08:00
Roman Nurik
6e593782d1 am c38d511a: (-s ours) am 93d610d5: DO NOT MERGE Cherrypick from master: Allow d.a.c. to serve SVG files 
* commit 'c38d511ab0858b222525f9f5e509408515634572':
  DO NOT MERGE Cherrypick from master: Allow d.a.c. to serve SVG files
 2011-12-20 12:06:37 -08:00
Roman Nurik
c38d511ab0 am 93d610d5: DO NOT MERGE Cherrypick from master: Allow d.a.c. to serve SVG files 
* commit '93d610d59aa9cbbaa99f760542252f91698103eb':
  DO NOT MERGE Cherrypick from master: Allow d.a.c. to serve SVG files
 2011-12-20 12:04:33 -08:00
Roman Nurik
d951bcf132 am 93d610d5: DO NOT MERGE Cherrypick from master: Allow d.a.c. to serve SVG files 
* commit '93d610d59aa9cbbaa99f760542252f91698103eb':
  DO NOT MERGE Cherrypick from master: Allow d.a.c. to serve SVG files
 2011-12-20 12:04:24 -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
Roman Nurik
9cfadf2abd am a64f05b6: Allow d.a.c. to serve SVG files 
* commit 'a64f05b65bf2bf72aa5730fabb9eae7ae7f3009d':
  Allow d.a.c. to serve SVG files
 2011-12-20 11:00:52 -08:00
Roman Nurik
a64f05b65b Allow d.a.c. to serve SVG files 
Change-Id: Ia652bd2f0a6a0dcfd17915dde5269bd8d37bceef
 2011-12-20 10:54:44 -08:00
The Android Automerger
c5c9827f6c merge in ics-release history after reset to master 2011-12-19 06:59:28 -08:00
Tor Norbye
714e5160b7 Update default project icons, and add an xhdpi version 
Change-Id: I7546fb49bc2190c2776290320c87e2cb3843be48
 2011-12-16 15:21:12 -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
08ce8eb0e9 am 1c59fc4f: am 5192264c: (-s ours) am dc6a269f: Merge commit \'71c1d3d8\' into MR1 using -s ours 
* commit '1c59fc4f56c095800e692b6e5317709766ac97be':
  Move platform component to rev3. do not merge.
 2011-12-15 16:00:49 -08:00
Xavier Ducrohet
1c59fc4f56 am 5192264c: (-s ours) am dc6a269f: Merge commit \'71c1d3d8\' into MR1 using -s ours 
* commit '5192264cf4b2742443bd66d4d320a63f7a39f3bc':
  Move platform component to rev3. do not merge.
 2011-12-15 15:58:43 -08:00