Commit Graph

1363 Commits

Author SHA1 Message Date
Dianne Hackborn
689f95b1ab am 3c407385: am e03f7627: am 85241cc7: Add button to clear back stack.
* commit '3c407385303dc44906342147368451f2ef528cff':
  Add button to clear back stack.
2012-01-25 09:00:47 -08:00
Dianne Hackborn
3c40738530 am e03f7627: am 85241cc7: Add button to clear back stack.
* commit 'e03f7627874b4f8c0bfa5c302f59a6d0cd83ee40':
  Add button to clear back stack.
2012-01-25 08:57:43 -08:00
Dianne Hackborn
85241cc795 Add button to clear back stack.
Change-Id: I4f02714ec349055a486608ff0eab75a46d6ba7cd
2012-01-24 13:39:02 -08:00
Robert Ly
74c1836184 updating the SampleSyncAdapter sample to add stream item and photo code
Change-Id: Ic5f16194fc0d0314d9170a8598eccc17b6a4e26c
2012-01-23 17:58:16 -08:00
Andy McFadden
dc1c5412e5 am fb4ffd37: Merge "Use Map.Entry, not LinkedHashMap.Entry"
* commit 'fb4ffd37de2c4cdf0af962f960076dc7ba1c12ab':
  Use Map.Entry, not LinkedHashMap.Entry
2012-01-23 09:36:00 -08:00
Andy McFadden
fb4ffd37de Merge "Use Map.Entry, not LinkedHashMap.Entry" 2012-01-23 09:34:38 -08:00
Robert Ly
6804eb4b3e am 9dc9cff1: am b295c347: am 3d398d72: Revert "updating the SampleSyncAdapter sample to add stream item and photo code"
* commit '9dc9cff102391ca7b2eb8b680554e7848f20e973':
  Revert "updating the SampleSyncAdapter sample to add stream item and photo code"
2012-01-20 16:43:19 -08:00
Robert Ly
0c196f9a77 am 993c70d3: am 85755fae: am 7a98345f: updating the SampleSyncAdapter sample to add stream item and photo code
* commit '993c70d3fad09e6827017e87abfcb286c1a964d8':
  updating the SampleSyncAdapter sample to add stream item and photo code
2012-01-20 16:43:17 -08:00
Robert Ly
9dc9cff102 am b295c347: am 3d398d72: Revert "updating the SampleSyncAdapter sample to add stream item and photo code"
* commit 'b295c347f44b2390f44bdbaffdd1c37ab19cc2ff':
  Revert "updating the SampleSyncAdapter sample to add stream item and photo code"
2012-01-20 16:38:03 -08:00
Robert Ly
993c70d3fa am 85755fae: am 7a98345f: updating the SampleSyncAdapter sample to add stream item and photo code
* commit '85755fae3bda06e94e1d191c20c70e5344293b9a':
  updating the SampleSyncAdapter sample to add stream item and photo code
2012-01-20 16:37:56 -08:00
Dianne Hackborn
4497b29f6f am 37e103ca: am 5370dc8f: am 2a9de021: Clean up and extend the linkify sample.
* commit '37e103caf5f0264fb84fc25174661bf74c6c4715':
  Clean up and extend the linkify sample.
2012-01-20 15:54:40 -08:00
Dianne Hackborn
37e103caf5 am 5370dc8f: am 2a9de021: Clean up and extend the linkify sample.
* commit '5370dc8f0dc20a46302f823af38cb48d08de1c45':
  Clean up and extend the linkify sample.
2012-01-20 15:52:04 -08:00
Andy McFadden
0da366d78a Use Map.Entry, not LinkedHashMap.Entry
Map.Entry is the defined return value from entrySet().
LinkedHashMap.Entry shouldn't be used directly.

Change-Id: Ib23ceac365c85cdec6ab1688e8f8168ce882bc90
2012-01-20 14:38:08 -08:00
Robert Ly
3d398d7243 Revert "updating the SampleSyncAdapter sample to add stream item and photo code"
This reverts commit 7a98345fc5
2012-01-20 11:07:10 -08:00
Robert Ly
7a98345fc5 updating the SampleSyncAdapter sample to add stream item and photo code
Change-Id: I6d44ea3f912a3d1e52695bda785c81ff527160d5
2012-01-19 14:51:23 -08:00
Dianne Hackborn
2a9de0211d Clean up and extend the linkify sample.
Change-Id: If9d0451af3bfcdcd8bafb325f4b7978857efab7e
2012-01-13 14:00:01 -08:00
Katie McCormick
71f9a53def am 6588fb68: am 811d1dd3: am e065fd62: Merge "Doc change: updated index page for HDP sample." into ics-mr1
* commit '6588fb68eca45b8a6872b0f82eaffcbf8375a6c7':
  Doc change: updated index page for HDP sample.
2012-01-11 16:09:40 -08:00
Katie McCormick
6588fb68ec am 811d1dd3: am e065fd62: Merge "Doc change: updated index page for HDP sample." into ics-mr1
* commit '811d1dd339adc9f005d34611ffbf0d4ded4c9fa8':
  Doc change: updated index page for HDP sample.
2012-01-11 16:07:33 -08:00
Katie McCormick
e065fd6209 Merge "Doc change: updated index page for HDP sample." into ics-mr1 2012-01-11 16:02:50 -08:00
Dianne Hackborn
3374f30c50 am d2f0e466: am 2492079b: am 0b6b4f2d: Merge "Fix notification sample to follow current UI guidelines." into ics-mr1
* commit 'd2f0e4667fd096094d8a4ea4f4f25db1a23675ad':
  Fix notification sample to follow current UI guidelines.
2012-01-11 10:59:14 -08:00
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