summaryrefslogtreecommitdiffstats
path: root/docs/html/training
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2013-08-26 12:31:09 -0700
committerScott Main <smain@google.com>2013-08-26 12:49:39 -0700
commitd608d5e3fa08cd9935f03144b192ea5934c715a8 (patch)
treedae5d6b4bd3fcdbb22c8427901f5f7b353cccb83 /docs/html/training
parent2c30fe8aedc5af2845e97b9005d6dce570f9d8eb (diff)
downloadframeworks_base-d608d5e3fa08cd9935f03144b192ea5934c715a8.zip
frameworks_base-d608d5e3fa08cd9935f03144b192ea5934c715a8.tar.gz
frameworks_base-d608d5e3fa08cd9935f03144b192ea5934c715a8.tar.bz2
add jb mr2 uses-feature items to reference page and fix a couple doc bugs
Change-Id: I1b95d98b083af3dad55f19a9e68f69460d4e6e57
Diffstat (limited to 'docs/html/training')
-rw-r--r--docs/html/training/animation/crossfade.jd4
-rw-r--r--docs/html/training/basics/firstapp/starting-activity.jd5
2 files changed, 3 insertions, 6 deletions
diff --git a/docs/html/training/animation/crossfade.jd b/docs/html/training/animation/crossfade.jd
index 2fbb6c0..7e947f3 100644
--- a/docs/html/training/animation/crossfade.jd
+++ b/docs/html/training/animation/crossfade.jd
@@ -205,13 +205,13 @@ private void crossfade() {
// Animate the loading view to 0% opacity. After the animation ends,
// set its visibility to GONE as an optimization step (it won't
// participate in layout passes, etc.)
- mHideView.animate()
+ mLoadingView.animate()
.alpha(0f)
.setDuration(mShortAnimationDuration)
.setListener(new AnimatorListenerAdapter() {
&#64;Override
public void onAnimationEnd(Animator animation) {
- mHideView.setVisibility(View.GONE);
+ mLoadingView.setVisibility(View.GONE);
}
});
}
diff --git a/docs/html/training/basics/firstapp/starting-activity.jd b/docs/html/training/basics/firstapp/starting-activity.jd
index 6f7fa5d..712eabc 100644
--- a/docs/html/training/basics/firstapp/starting-activity.jd
+++ b/docs/html/training/basics/firstapp/starting-activity.jd
@@ -426,10 +426,7 @@ on Android 4.0.
<p>That's it, you've built your first Android app!</p>
-<p>To learn more about building Android apps, continue to follow the
-basic training classes. The next class is <a
-href="{@docRoot}training/basics/activity-lifecycle/index.html">Managing the Activity
-Lifecycle</a>.</p>
+<p>To learn more, follow the link below to the next class.</p>