summaryrefslogtreecommitdiffstats
path: root/samples
diff options
context:
space:
mode:
authorRicardo Cervera <rcervera@google.com>2014-03-13 22:15:03 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-13 22:15:03 +0000
commitf203e0289eb1e418a5ce2049893306bcd13d30a7 (patch)
treefbaa2e2d979331c626cd9a229ceacaa179aa221a /samples
parent7ae2eca4a0762f347e2a1981dc1becbc16a5c4bc (diff)
parentc861a2650bce3a0ff02f1efcb5c6b38e741c1878 (diff)
downloadandroid_development-f203e0289eb1e418a5ce2049893306bcd13d30a7.tar.gz
android_development-f203e0289eb1e418a5ce2049893306bcd13d30a7.tar.bz2
android_development-f203e0289eb1e418a5ce2049893306bcd13d30a7.zip
am c861a265: Merge "docs: Modified sample descriptions for March sample push." into klp-docs
* commit 'c861a2650bce3a0ff02f1efcb5c6b38e741c1878': docs: Modified sample descriptions for March sample push.
Diffstat (limited to 'samples')
-rw-r--r--samples/browseable/AdapterTransition/_index.jd8
-rw-r--r--samples/browseable/AdvancedImmersiveMode/_index.jd15
-rw-r--r--samples/browseable/BasicTransition/_index.jd9
-rw-r--r--samples/browseable/DisplayingBitmaps/_index.jd23
-rw-r--r--samples/browseable/MediaRouter/_index.jd4
5 files changed, 33 insertions, 26 deletions
diff --git a/samples/browseable/AdapterTransition/_index.jd b/samples/browseable/AdapterTransition/_index.jd
index 24ca6e182..d5c48a392 100644
--- a/samples/browseable/AdapterTransition/_index.jd
+++ b/samples/browseable/AdapterTransition/_index.jd
@@ -6,7 +6,7 @@ sample.group=UI
@jd:body
<p>
-
- Transition cannot be directly applied to AdapterViews. In this sample, we demonstrate how to create a overlay layout and run a Transition on it.
-
- </p>
+{@link android.transition.Transition Transition} cannot be directly applied to
+{@link android.widget.AdapterView AdapterView}s. This sample demonstrates how to
+create a overlay layout and how to run a transition on it.
+</p>
diff --git a/samples/browseable/AdvancedImmersiveMode/_index.jd b/samples/browseable/AdvancedImmersiveMode/_index.jd
index 2b19c9c74..7048fe838 100644
--- a/samples/browseable/AdvancedImmersiveMode/_index.jd
+++ b/samples/browseable/AdvancedImmersiveMode/_index.jd
@@ -5,10 +5,15 @@ page.tags="AdvancedImmersiveMode"
sample.group=UI
@jd:body
-<p>Android 4.4 introduces a way for you to provide a more immersive screen
-experience in your app, by letting users show or hide the status bar and
-navigation bar with a swipe.</p>
-<p>This sample demonstrates how this features interacts with some of the other
+<p>
+Android 4.4 introduces a way for you to provide a more immersive screen
+experience in your app by letting users show or hide the status bar and
+the navigation bar with a swipe.
+</p>
+
+<p>
+This sample demonstrates how this feature interacts with some of the other
UI flags related to full-screen apps. The sample also shows how to implement a
"sticky" mode, which re-hides the bars a few seconds after the user swipes
-them back in.</p>
+them back in.
+</p> \ No newline at end of file
diff --git a/samples/browseable/BasicTransition/_index.jd b/samples/browseable/BasicTransition/_index.jd
index e65ec530f..af2a6e739 100644
--- a/samples/browseable/BasicTransition/_index.jd
+++ b/samples/browseable/BasicTransition/_index.jd
@@ -6,8 +6,7 @@ sample.group=UI
@jd:body
<p>
-
- This sample demonstrates the basic use of the transition framework introduced in KitKat.
- Select each of the RadioButtons to switch between the Scenes.
-
- </p>
+This sample demonstrates the basic use of the transition framework introduced in KitKat.
+Select each of the radio buttons to switch between the
+{@link android.transition.Scene Scene}s.
+</p>
diff --git a/samples/browseable/DisplayingBitmaps/_index.jd b/samples/browseable/DisplayingBitmaps/_index.jd
index ccb4fa8f2..eb880978f 100644
--- a/samples/browseable/DisplayingBitmaps/_index.jd
+++ b/samples/browseable/DisplayingBitmaps/_index.jd
@@ -5,14 +5,17 @@ page.tags="DisplayingBitmaps"
sample.group=UI
@jd:body
-<p>
-
- This is a sample application for the Android Training class
- &quot;Displaying Bitmaps Efficiently&quot;
- (http://developer.android.com/training/displaying-bitmaps/).\n\n
+<p>This is a sample application for the
+<a href="{@docRoot}training/displaying-bitmaps/index.html">Displaying
+Bitmaps Efficiently</a> Android Training class.</p>
- It demonstrates how to load large bitmaps efficiently off the main UI thread, caching
- bitmaps (both in memory and on disk), managing bitmap memory and displaying bitmaps
- in UI elements such as ViewPager and ListView/GridView.
-
- </p>
+<p>
+The sample demonstrates:
+</p>
+<ul>
+<li>Loading large bitmaps efficiently outside the main UI thread.</li>
+<li>Caching bitmaps (both in memory and on disk).</li>
+<li>Managing bitmap memory.</li>
+<li>Displaying bitmaps in UI elements (such as {@link android.support.v4.view.ViewPager ViewPager},
+{@link android.widget.ListView ListView}, and {@link android.widget.GridView GridView}).</li>
+</ul> \ No newline at end of file
diff --git a/samples/browseable/MediaRouter/_index.jd b/samples/browseable/MediaRouter/_index.jd
index a46cae8dc..5ca94679e 100644
--- a/samples/browseable/MediaRouter/_index.jd
+++ b/samples/browseable/MediaRouter/_index.jd
@@ -6,5 +6,5 @@ sample.group=Media
@jd:body
<p>
- Demonstrates how to create a custom media route provider.
-</p>
+This sample demonstrates how to create a custom media route provider.
+</p> \ No newline at end of file