Commit Graph

1493 Commits

Author SHA1 Message Date
Dianne Hackborn
d2f0e4667f am 2492079b: am 0b6b4f2d: Merge "Fix notification sample to follow current UI guidelines." into ics-mr1
* commit '2492079bb859b689adc1ff5504bfc274a9ba07ee':
  Fix notification sample to follow current UI guidelines.
2012-01-11 10:56:42 -08:00
Dianne Hackborn
174f61c0e9 Fix notification sample to follow current UI guidelines.
Lots of clean up on the messaging notification sample to show the real
correct way to do things.  Also mark up a bunch of the sample for use
in the documentation.

Change-Id: I3a29a944c2971e142c33b29aff94b1ba0b40ae0e
2012-01-10 15:53:32 -08:00
Adam Powell
c7cbf9351a am 30e2c473: Merge "Catch IOException for close"
* commit '30e2c473e896af55fb14a03e99d0841d2753da8d':
  Catch IOException for close
2012-01-10 14:46:39 -08:00
Adam Powell
e882d4c266 Catch IOException for close
Change-Id: I23115f6fa4f54fd4e1de59f3bb781dcf28e1371b
2012-01-10 14:07:23 -08:00
Adam Powell
294d526e11 am 87376a45: Merge "Add code sample for ShareCompat"
* commit '87376a45e4782f81710655bbacfe95c9212a5ebe':
  Add code sample for ShareCompat
2012-01-10 13:32:39 -08:00
Adam Powell
87376a45e4 Merge "Add code sample for ShareCompat" 2012-01-10 13:31:09 -08:00
Steve Block
9033d6efcf am 5a622cba: Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE
* commit '5a622cba8c5287d5e6577f940a22343a7cae977f':
  Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)  DO NOT MERGE
2012-01-09 11:22:47 -08:00
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
Katie McCormick
f741c05f0c Doc change: updated index page for HDP sample.
Change-Id: I06a6af5bdfac9a260ca053dd11030631e49c2509
2012-01-06 12:45:32 -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
Jason Sams
fc2aded9ce Fix headers
Change-Id: I74832252a5fc0fdc543c29ac1a85ce39a97b2821
2012-01-04 17:48:54 -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
Scott Main
644593faeb am fbd55a98: am 22260459: am cbfbaee2: am e9747521: Merge "Sample code for Android U lesson: Monetization - Ads without Compromising User Experience." into ics-mr0
* commit 'fbd55a98481eb083ceed037deb2a47c1d9d77d31':
  Sample code for Android U lesson: Monetization - Ads without Compromising User Experience.
2011-12-15 11:00:24 -08:00
Scott Main
b8e683b640 am 1d0a6e45: am 3fab73d5: am 335151a3: am d46d8577: Merge "Sample app for Android U lesson: Building apps for enterprise - Device administration." into ics-mr0
* commit '1d0a6e45c1a2340dbf5df4beb9b851df0b094d31':
  Sample app for Android U lesson: Building apps for enterprise - Device administration.
2011-12-15 11:00:23 -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
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
Adam Powell
1bc7aaff48 Add code sample for ShareCompat
Add SharingSupport activity - use ShareCompat.IntentBuilder to produce
sharing intents for menu item sharing, text only, single stream, and
multiple stream.

Add SharingReceiverSupport - receive text/plain content as text only,
single stream, and multiple stream.

Add SharingSupportProvider - simple filesystem-based read-only
ContentProvider for providing a data stream.

Change-Id: I7e69a80984c0c5a8d93663f928f644d55c92350d
2011-12-14 12:14:40 -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
9b09844bae am b6062546: 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
* commit 'b6062546c4702d4c0c3def706f45a176a7552e12':
  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 14:28:47 -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
c6fb68b41e am 1bf05273: am 100dc50d: am 170b26ba: Merge "SDK only: add markup for use in documentation." into ics-mr1
* commit '1bf05273dcdefd2ef139e167d0c097a9daf64398':
  SDK only: add markup for use in documentation.
2011-12-13 05:47:37 -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
a052d9d866 am 82812f2c: am e66ffc14: am fed7d838: Move samples to API 15.
* commit '82812f2c1f542a68d03ac577f51c6101b5503a44':
  Move samples to API 15.
2011-12-12 15:41:49 -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
4220e11c4d am bbafd9c0: am efe10dd5: am 7e3475ca: am 4ea24bff: cherrypick from master cl Change-Id: I45f91fd9cfe0cb89789017deec63565e4757063e Adding the NewsReader sample.
* commit 'bbafd9c0b6fd5238713c22048025d1cfcf56a353':
  cherrypick from master cl Change-Id: I45f91fd9cfe0cb89789017deec63565e4757063e Adding the NewsReader sample.
2011-12-12 15:34:34 -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
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
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
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
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
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
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