diff options
| -rw-r--r-- | docs/html/guide/topics/manifest/uses-feature-element.jd | 43 | ||||
| -rw-r--r-- | docs/html/training/animation/crossfade.jd | 4 | ||||
| -rw-r--r-- | docs/html/training/basics/firstapp/starting-activity.jd | 5 |
3 files changed, 36 insertions, 16 deletions
diff --git a/docs/html/guide/topics/manifest/uses-feature-element.jd b/docs/html/guide/topics/manifest/uses-feature-element.jd index af35540..95f62a5 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.</td> <td>Bluetooth</td> <td><code>android.hardware.bluetooth</td> <td>The application uses Bluetooth radio features in the device.</td> -<td> -</td> + <td>If your app uses Bluetooth Low Energy, also declare + {@code android.software.bluetooth_le}.</td> </tr> <tr> <td rowspan="5">Camera</td> @@ -849,26 +849,49 @@ in a separate <code><uses-feature></code> element. </p> <th>Feature</th> <th>Attribute Value</th> <th>Description</th> - <th>Comments</th> +</tr> +<tr> + <td>App Widgets</td> + <td><code>android.software.app_widgets</code></td> + <td>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.</td> +</tr> +<tr> + <td>Bluetooth Low Energy</td> + <td><code>android.software.bluetooth_le</code></td> + <td><p>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. + <p>This implicitly also declares the {@code android.hardware.bluetooth} feature.</td> +</tr> +<tr> + <td>Home Screen</td> + <td><code>android.software.home_screen</code></td> + <td>The application behaves as a Home screen replacement and should be installed only on + devices that support third-party Home screen apps.</td> +</tr> +<tr> + <td>Input Method</td> + <td><code>android.software.input_methods</code></td> + <td>The application provides a custom input method and should be installed only on devices that + support third-party input methods.</td> </tr> <tr> <td>Live Wallpaper</td> <td><code>android.software.live_wallpaper</code></td> - <td>The application uses or provides Live Wallpapers.</td> - <td></td> + <td>The application uses or provides Live Wallpapers and should be installed only on devices that + support Live Wallpapers.</td> </tr> <tr> <td rowspan="2">SIP/VOIP</td> <td><code>android.software.sip</code></td> - <td>The application uses SIP service on the device. + <td>The application uses SIP service on the device and should be installed only on devices that + support SIP. </td> - <td></td> </tr> <tr> <td><code>android.software.sip.voip</code></td> - <td>Subfeature. The application uses SIP-based VOIP service on the device. - </td> - <td>This subfeature implicitly declares the <code>android.software.sip</code> parent feature, + <td><p>Subfeature. The application uses SIP-based VOIP service on the device. + <p>This subfeature implicitly declares the <code>android.software.sip</code> parent feature, unless declared with <code>android:required="false"</code>.</td> </tr> </table> 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() { @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> |