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

8539 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Xavier Ducrohet
5192264cf4 am dc6a269f: Merge commit \'71c1d3d8\' into MR1 using -s ours 
* commit 'dc6a269f821073fc4bb4cf0f463e09ef15619fd3':
  Move platform component to rev3. do not merge.
 2011-12-15 15:55:50 -08:00
Xavier Ducrohet
dc6a269f82 Merge commit '71c1d3d8' into MR1 using -s ours 
Change-Id: I392ab7665f40f9c273f8d0f837597f1bd6c9d135
 2011-12-15 15:52:09 -08:00
Xavier Ducrohet
71c1d3d864 Move platform component to rev3. do not merge. 
Change-Id: I21157462faf12322112244d13390592e24529748
 2011-12-15 14:53:40 -08:00
Xavier Ducrohet
2cbdc6a768 am c1b26007: (-s ours) am c3a76886: am 2d954623: Fix WXGA720 skin to be portrait by default. do not merge. 
* commit 'c1b26007a49cc6bf9483800b76f039c778335990':
  Fix WXGA720 skin to be portrait by default. do not merge.
 2011-12-15 14:44:38 -08:00
Xavier Ducrohet
c1b26007a4 am c3a76886: am 2d954623: Fix WXGA720 skin to be portrait by default. do not merge. 
* commit 'c3a7688651789c53bc468dade39604a386ac364f':
  Fix WXGA720 skin to be portrait by default. do not merge.
 2011-12-15 14:42:35 -08:00
Xavier Ducrohet
c3a7688651 am 2d954623: Fix WXGA720 skin to be portrait by default. do not merge. 
* commit '2d95462334a254a6d1aedbc431e19fdb2bb2a0e6':
  Fix WXGA720 skin to be portrait by default. do not merge.
 2011-12-15 14:41:12 -08:00
Xavier Ducrohet
2d95462334 Fix WXGA720 skin to be portrait by default. do not merge. 
Having it landscape by default is not representative of a phone
and triggers an issue where the system ui bar is not displayed.

(cherry picked from commit 144589bfd0)

Change-Id: I67398ff618ac76da4ec02d1d2e518a8f7618b0fa
 2011-12-15 14:38:56 -08:00
Xavier Ducrohet
1ee0d798d6 am 47dea794: am 31ecada2: Merge "Fix WXGA720 skin to be portrait by default." into ics-mr1 
* commit '47dea79401dffbb0f030df6e9d94e428348b700a':
  Fix WXGA720 skin to be portrait by default.
 2011-12-15 14:35:27 -08:00
Xavier Ducrohet
47dea79401 am 31ecada2: Merge "Fix WXGA720 skin to be portrait by default." into ics-mr1 
* commit '31ecada2eed999c9d725cf9af8e634496e462b59':
  Fix WXGA720 skin to be portrait by default.
 2011-12-15 14:33:27 -08:00
Xavier Ducrohet
31ecada2ee Merge "Fix WXGA720 skin to be portrait by default." into ics-mr1 2011-12-15 14:31:16 -08:00
Xavier Ducrohet
144589bfd0 Fix WXGA720 skin to be portrait by default. 
Having it landscape by default is not representative of a phone
and triggers an issue where the system ui bar is not displayed.

Change-Id: Ic28e3739c30825fe55f8cc6cede5c9a5462f6931
 2011-12-15 14:28:46 -08:00
Scott Main
fbd55a9848 am 22260459: am cbfbaee2: am e9747521: Merge "Sample code for Android U lesson: Monetization - Ads without Compromising User Experience." into ics-mr0 
* commit '222604594cc398c3f754704bad445ac8285ad9e1':
  Sample code for Android U lesson: Monetization - Ads without Compromising User Experience.
 2011-12-15 10:19:18 -08:00
Scott Main
1d0a6e45c1 am 3fab73d5: am 335151a3: am d46d8577: Merge "Sample app for Android U lesson: Building apps for enterprise - Device administration." into ics-mr0 
* commit '3fab73d56bbc614de9052a5e8b9218295e7c708a':
  Sample app for Android U lesson: Building apps for enterprise - Device administration.
 2011-12-15 10:19:17 -08:00
Scott Main
222604594c am cbfbaee2: am e9747521: Merge "Sample code for Android U lesson: Monetization - Ads without Compromising User Experience." into ics-mr0 
* commit 'cbfbaee25e7de47038a08a83d11bcc3a4f2d84eb':
  Sample code for Android U lesson: Monetization - Ads without Compromising User Experience.
 2011-12-15 10:17:27 -08:00
Scott Main
3fab73d56b am 335151a3: am d46d8577: Merge "Sample app for Android U lesson: Building apps for enterprise - Device administration." into ics-mr0 
* commit '335151a356db9b3b5204cb648f80239d29f4a38f':
  Sample app for Android U lesson: Building apps for enterprise - Device administration.
 2011-12-15 10:17:24 -08:00
Scott Main
cbfbaee25e am e9747521: Merge "Sample code for Android U lesson: Monetization - Ads without Compromising User Experience." into ics-mr0 
* commit 'e97475210ab07f0e49b14d267027ab03a68d1099':
  Sample code for Android U lesson: Monetization - Ads without Compromising User Experience.
 2011-12-15 10:15:11 -08:00
Scott Main
335151a356 am d46d8577: Merge "Sample app for Android U lesson: Building apps for enterprise - Device administration." into ics-mr0 
* commit 'd46d8577a8cf5ed96c01a70442380910016cdbe2':
  Sample app for Android U lesson: Building apps for enterprise - Device administration.
 2011-12-15 10:15:09 -08:00
Scott Main
e97475210a Merge "Sample code for Android U lesson: Monetization - Ads without Compromising User Experience." into ics-mr0 2011-12-15 10:12:19 -08:00