diff --git a/docs/html/guide/topics/manifest/uses-feature-element.jd b/docs/html/guide/topics/manifest/uses-feature-element.jd
index af35540deb079..95f62a581cb2c 100644
--- a/docs/html/guide/topics/manifest/uses-feature-element.jd
+++ b/docs/html/guide/topics/manifest/uses-feature-element.jd
@@ -552,8 +552,8 @@ is sensitive to delays or lag in sound input or output.
Bluetooth |
android.hardware.bluetooth |
The application uses Bluetooth radio features in the device. |
-
- |
+ If your app uses Bluetooth Low Energy, also declare
+ {@code android.software.bluetooth_le}. |
| Camera |
@@ -849,26 +849,49 @@ in a separate <uses-feature> element.
Feature |
Attribute Value |
Description |
- Comments |
+
+
+ | App Widgets |
+ android.software.app_widgets |
+ The application uses or provides App Widgets and should be installed only on devices
+ that include a Home screen or similar location where users can embed App Widgets. |
+
+
+ | Bluetooth Low Energy |
+ android.software.bluetooth_le |
+ The application uses Bluetooth Low Energy APIs and should be installed only on devices
+ that are capable of communicating with other devices via Bluetooth Low Energy.
+ This implicitly also declares the {@code android.hardware.bluetooth} feature. |
+
+
+ | Home Screen |
+ android.software.home_screen |
+ The application behaves as a Home screen replacement and should be installed only on
+ devices that support third-party Home screen apps. |
+
+
+ | Input Method |
+ android.software.input_methods |
+ The application provides a custom input method and should be installed only on devices that
+ support third-party input methods. |
| Live Wallpaper |
android.software.live_wallpaper |
- The application uses or provides Live Wallpapers. |
- |
+ The application uses or provides Live Wallpapers and should be installed only on devices that
+ support Live Wallpapers. |
| SIP/VOIP |
android.software.sip |
- The application uses SIP service on the device.
+ | The application uses SIP service on the device and should be installed only on devices that
+ support SIP.
|
- |
android.software.sip.voip |
- Subfeature. The application uses SIP-based VOIP service on the device.
- |
- This subfeature implicitly declares the android.software.sip parent feature,
+ | Subfeature. The application uses SIP-based VOIP service on the device.
+ This subfeature implicitly declares the android.software.sip parent feature,
unless declared with android:required="false". |
diff --git a/docs/html/training/animation/crossfade.jd b/docs/html/training/animation/crossfade.jd
index 2fbb6c00b45b6..7e947f3d7ece5 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() {
@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 6f7fa5d5777d5..712eabc424c8a 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.
That's it, you've built your first Android app!
-To learn more about building Android apps, continue to follow the
-basic training classes. The next class is Managing the Activity
-Lifecycle.
+To learn more, follow the link below to the next class.