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

8411 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xavier Ducrohet
6967183115 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:10 -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
1793cd5a36 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:43 -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
cbdb3aaedb 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:42 -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
cb20ad9994 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:18 -08:00
Scott Main
bde06a0992 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:17 -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
Scott Main
d46d8577a8 Merge "Sample app for Android U lesson: Building apps for enterprise - Device administration." into ics-mr0 2011-12-15 10:11:55 -08:00
Fred Chung
b9c12ba27b Sample app for Android U lesson: Building apps for enterprise - Device administration. 
Change-Id: Ie4fbc26be45c32d19a94faed68d9f4070a96c1d7
 2011-12-14 20:08:51 -08:00
Fred Chung
df52a4cafe Sample code for Android U lesson: Monetization - Ads without Compromising User Experience. 
Change-Id: I6b077c24f71c00e99fe6e15da127b02707ad57f3
 2011-12-13 15:39:35 -08:00
Scott Main
925f2f6968 am a5601068: am 514d1cdb: Merge "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 l 
* commit 'a56010682aa45e86ce9e675a88415071397e18e9':
  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
 2011-12-13 13:13:37 -08:00
Scott Main
a56010682a am 514d1cdb: Merge "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 p 
* commit '514d1cdb04594d418828f0c6ec642cb180608198':
  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
 2011-12-13 13:10:41 -08:00
Raphael
fa8816ac72 am 476edbaa: Merge "SDK: package fastboot in platform-tools on 3 OSes." Do not merge. 
* commit '476edbaae4f458ec8283955872481bd2565ed5b3':
  Merge "SDK: package fastboot in platform-tools on 3 OSes." Do not merge.
 2011-12-13 11:32:22 -08:00
Scott Main
514d1cdb04 Merge "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" into ics-mr0 2011-12-13 10:25:23 -08:00
Raphael
476edbaae4 Merge "SDK: package fastboot in platform-tools on 3 OSes." Do not merge. 
SDK Bug: 21115

(cherry picked from commit 94a55ddf0b)

Change-Id: I7c61bd171d85a52fdb0ac21bd2861f3d474eb4dc
 2011-12-12 22:08:12 -08:00
Xavier Ducrohet
f9b3ee835e am 56259594: Merge "Move support lib to rev 6." into ics-mr1 
* commit '56259594da620757e95172ef6ff68cade501da51':
  Move support lib to rev 6.
 2011-12-12 18:09:56 -08:00
Dianne Hackborn
fd286c353f 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 18:09:52 -08:00
Jesse Hall
18ff0e6a86 am 5d721ef6: am b0a30e43: EmuGL: remove broken EGL buffer refcounting 
* commit '5d721ef6a14dc22c6b44042f83f3a48ad68d05d4':
  EmuGL: remove broken EGL buffer refcounting
 2011-12-12 18:09:45 -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
170b26ba32 Merge "SDK only: add markup for use in documentation." into ics-mr1 2011-12-12 16:09:23 -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
Xavier Ducrohet
a05b88e168 am fed7d838: Move samples to API 15. 
* commit 'fed7d838d0b4eec94bd2d5910fa496bd1849052e':
  Move samples to API 15.
 2011-12-09 16:36:30 -08:00
Xavier Ducrohet
fed7d838d0 Move samples to API 15. 
Change-Id: I70a065033ad157ca15cddf56e81c631c301854a0
 2011-12-09 16:34:20 -08:00
Xavier Ducrohet
99dbc05515 am 646e7964: Merge "Increase skin ram and vmheap." into ics-mr1 
* commit '646e7964f94f0ba55f67e91996009833b2dd0ead':
  Increase skin ram and vmheap.
 2011-12-09 15:55:36 -08:00
James Dong
f657a0a7ff 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 15:55:32 -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
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
359ad04d49 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:09:38 -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
David Hu
600fe5e419 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:40:53 -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
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
ad13b6b62f Set proper version of API 15 in SDK files. 
Change-Id: I5d3a5dd6b9bf9b54f964f9188263109056e60796
 2011-12-08 14:39:46 -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
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
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