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

1270 Commits

Author SHA1 Message Date
Steve Block
5a622cba8c Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE 
See https://android-git.corp.google.com/g/#/c/157220

Bug: 5449033
Change-Id: Ic6cac56d137f705dfa7266f21e9b0269219bd5d1
 2012-01-09 10:39:43 +00: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
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
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
b6062546c4 am f9a0d6e9: 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. 
* commit 'f9a0d6e9d727f0a8fe806f0089a28c8c6b0cdd83':
  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:15:23 -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
Dianne Hackborn
1bf05273dc am 100dc50d: am 170b26ba: Merge "SDK only: add markup for use in documentation." into ics-mr1 
* commit '100dc50d0b40330cb0e189653d1965ab1c20095b':
  SDK only: add markup for use in documentation.
 2011-12-12 17:49:32 -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
Xavier Ducrohet
82812f2c1f am e66ffc14: am fed7d838: Move samples to API 15. 
* commit 'e66ffc1440e003eddb8b39cc335b41f345dc68c9':
  Move samples to API 15.
 2011-12-12 15:39:06 -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
Dianne Hackborn
e0c8f946e6 SDK only: add markup for use in documentation. 
Change-Id: Ia379c178a41db146a47a494b5c24e5f77d65ada7
 2011-12-12 15:15:19 -08:00
Xavier Ducrohet
fed7d838d0 Move samples to API 15. 
Change-Id: I70a065033ad157ca15cddf56e81c631c301854a0
 2011-12-09 16:34:20 -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
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
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
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
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
Svetoslav Ganov
cf0a198756 resolved conflicts for merge of cb0d49cd to master 
Change-Id: I0eabcb7b55a0b10f50e2e1f065213223b5600aab
 2011-11-30 18:53:19 -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
Trevor Johns
f56101e2a3 Issue #5689186: Add Guava as a dependency for NFCDemo sample 
This adds Guava v10.0.1 as a dependency for development/samples/NFCDemo.
Without this, the sample does not build.

Also added a NOTICE file for NFCDemo to hold attribution for Guava.

Change-Id: I324e3984a2bd95d31be8d09bda3d2eb893edf831
 2011-11-30 17:04:39 -08:00
Svetoslav Ganov
a75233833c Adding a code sample for implementing accessibility in a custom view. 
bug:5683532

Change-Id: I79471c431ba3aeb4abe57f850e84a4da0bc1feba
 2011-11-29 13:02:58 -08:00
Chia-chi Yeh
9ad3f40880 Android VPN sample for ICS SDK 
Change-Id: I84e568625c5c9cc9b48f338e2d6226a8e9f67017
 2011-11-28 17:21:34 -08:00
Jean-Baptiste Queru
14bc4b97a8 am 459d7f99: am a96a7c60: am c4d810a4: Merge "Inaccvrate Morse data in sample code." into ics-mr0 
* commit '459d7f999f8aba4f3c4e8d39c926fdb12e2a50e6':
  Inaccvrate Morse data in sample code.
 2011-11-28 11:33:01 -08:00
Jean-Baptiste Queru
a96a7c6040 am c4d810a4: Merge "Inaccvrate Morse data in sample code." into ics-mr0 
* commit 'c4d810a43ce5d052812a453b488ef0cc7511dfda':
  Inaccvrate Morse data in sample code.
 2011-11-28 11:28:45 -08:00
Jean-Baptiste Queru
cf2051ab22 Inaccvrate Morse data in sample code. 
This vses the trve seqvence, svch that vsers can be
vnderstood vpon revsing this data, thvs bypassing
svrprising qvestions.

Change-Id: I1741d0c4072ab43975981799f602a6a6cda25088
 2011-11-23 08:14:10 -08:00
Svetoslav Ganov
84ed1bb1de am 19c93bac: am cd2db139: Add the support libraries to the platform documentation (demos). 
* commit '19c93baca796c7cd9c7317e6a68d2f4cabbf915b':
  Add the support libraries to the platform documentation (demos).
 2011-11-18 15:22:35 -08:00
Svetoslav Ganov
cd2db139ae Add the support libraries to the platform documentation (demos). 
Updated the support demos due to renamed support classes.

bug:5629339

Change-Id: Ia94cd60ea2b89ad74003baaa8eb8e84d21822374
 2011-11-17 15:15:24 -08:00
Fred Chung
4c23a87d7a am e39ad49b: am 053c4648: Merge "SDK sample code for Bluetooth HDP API." into ics-mr1 
* commit 'e39ad49b453230058ff77df70565360975a68f04':
  SDK sample code for Bluetooth HDP API.
 2011-11-17 04:08:25 -08:00
Fred Chung
512ea9b6f8 DO NOT MERGE: SDK sample code for Bluetooth HDP API. 
Cherry pick from ics-mr1 Change ID I0f68ba42309c960f0df1e537b0932c6d68d9657b

Change-Id: I1d5e37fc24d82f8f9f846c82b93f68dcc58d95cc
 2011-11-16 15:26:28 -08:00
Fred Chung
053c46485b Merge "SDK sample code for Bluetooth HDP API." into ics-mr1 2011-11-16 09:31:44 -08:00
Svetoslav Ganov
3af6828840 am 402d3fd4: am 41867b63: Merge "Fix the support-v4 demos to work on a platform with APIs V4 (samples part)" into ics-mr1 
* commit '402d3fd41838dc6a098ec3482f83b20b32df29f4':
  Fix the support-v4 demos to work on a platform with APIs V4 (samples part)
 2011-11-15 14:40:44 -08:00
Svetoslav Ganov
41867b639f Merge "Fix the support-v4 demos to work on a platform with APIs V4 (samples part)" into ics-mr1 2011-11-15 14:34:53 -08:00
Svetoslav Ganov
a09e21a223 Fix the support-v4 demos to work on a platform with APIs V4 (samples part) 
Some of the samples are using APIs that are introduced after v4 but not supported
in the v4 library.  Update the samples to use the new stuff added to the support
library.

bug:5616340

Change-Id: I90889f5e9ee48e7e30249464e60d5d28cd3f7a4b
 2011-11-15 11:38:45 -08:00
Fred Chung
14c26228cd SDK sample code for Bluetooth HDP API. 
Change-Id: I0f68ba42309c960f0df1e537b0932c6d68d9657b
 2011-11-14 21:36:25 -08:00
Dianne Hackborn
0efad946bd am f1ab1a8e: am 2fd75c63: Move switch preference into its own demo. 
* commit 'f1ab1a8e26c89442b758c56613a47e35e71d2ef5':
  Move switch preference into its own demo.
 2011-11-14 14:38:27 -08:00
Dianne Hackborn
2fd75c6368 Move switch preference into its own demo. 
This avoids everything breaking on pre-ICS platforms.

Also get rid of pref initialization in Application. I hate that.  Hate
hate hate.  Hate.  Totally hate.

Totally.

Change-Id: Idb3526a96eb2dff49f9de8e5ae71149cb4ed6e96
 2011-11-14 14:28:42 -08:00
Ken Wakasa
638bfdf26d am c7160d8d: am c3b08379: Fix wrong paths to class references 
* commit 'c7160d8dcb9861af67eea4b822889b3ce93be0b9':
  Fix wrong paths to class references
 2011-11-07 16:49:17 +00:00
Ken Wakasa
c7160d8dcb am c3b08379: Fix wrong paths to class references 
* commit 'c3b0837982378fc1277295fb2322e33f6414a0b9':
  Fix wrong paths to class references
 2011-11-07 16:44:19 +00:00
Ken Wakasa
c3b0837982 Fix wrong paths to class references 
Change-Id: I778be2217165185fbb8eef08b8a232ea7ba986f0
 2011-11-07 20:00:25 +09:00
Robert Ly
65be1a5342 am cc1eef49: am 8e3c1951: Merge "adding fountain framebuffer object sdk sample" into ics-mr0 
* commit 'cc1eef493524af0ce727927996b346312637c78a':
  adding fountain framebuffer object sdk sample
 2011-11-03 19:59:31 +00:00
Robert Ly
cc1eef4935 am 8e3c1951: Merge "adding fountain framebuffer object sdk sample" into ics-mr0 
* commit '8e3c1951915010985db2abee212e8c4c37cacc53':
  adding fountain framebuffer object sdk sample
 2011-11-03 19:56:00 +00:00