diff --git a/core/java/android/widget/Gallery.java b/core/java/android/widget/Gallery.java index e4e7239a5bfbb..323fcf0695526 100644 --- a/core/java/android/widget/Gallery.java +++ b/core/java/android/widget/Gallery.java @@ -49,9 +49,6 @@ import com.android.internal.R; *

* Views given to the Gallery should use {@link Gallery.LayoutParams} as their * layout parameters type. - * - *

See the Gallery - * tutorial.

* * @attr ref android.R.styleable#Gallery_animationDuration * @attr ref android.R.styleable#Gallery_spacing diff --git a/core/java/android/widget/TabHost.java b/core/java/android/widget/TabHost.java index 9b292be9969ef..8bb9348f388b5 100644 --- a/core/java/android/widget/TabHost.java +++ b/core/java/android/widget/TabHost.java @@ -45,8 +45,6 @@ import java.util.List; * page. The individual elements are typically controlled using this container object, rather than * setting values on the child elements themselves. * - *

See the Tab Layout - * tutorial.

*/ public class TabHost extends FrameLayout implements ViewTreeObserver.OnTouchModeChangeListener { diff --git a/core/java/android/widget/TabWidget.java b/core/java/android/widget/TabWidget.java index 8901037942f67..6bced1c6977a6 100644 --- a/core/java/android/widget/TabWidget.java +++ b/core/java/android/widget/TabWidget.java @@ -42,9 +42,6 @@ import android.view.accessibility.AccessibilityNodeInfo; * handler, and manage callbacks. You might call this object to iterate the list * of tabs, or to tweak the layout of the tab list, but most methods should be * called on the containing TabHost object. - * - *

See the Tab Layout - * tutorial.

* * @attr ref android.R.styleable#TabWidget_divider * @attr ref android.R.styleable#TabWidget_tabStripEnabled diff --git a/core/java/android/widget/TableLayout.java b/core/java/android/widget/TableLayout.java index 6331b6d500f98..78e9453815964 100644 --- a/core/java/android/widget/TableLayout.java +++ b/core/java/android/widget/TableLayout.java @@ -70,8 +70,6 @@ import java.util.regex.Pattern; * actually use any View subclass as a direct child of TableLayout. The View * will be displayed as a single row that spans all the table columns.

* - *

See the Table - * Layout tutorial.

*/ public class TableLayout extends LinearLayout { private int[] mMaxWidths; diff --git a/docs/html/about/versions/android-4.1.jd b/docs/html/about/versions/android-4.1.jd index 675dc99b79553..367786037db55 100644 --- a/docs/html/about/versions/android-4.1.jd +++ b/docs/html/about/versions/android-4.1.jd @@ -663,7 +663,7 @@ android.app.Notification#PRIORITY_DEFAULT}, and there's two levels higher and tw

High priority notifications are things that users generally want to respond to quickly, such as a new instant message, text message, or impending event reminder. Low priority -notifications are things like

+notifications are things like expired calendar events or app promotions.

Controls for system UI

diff --git a/docs/html/about/versions/jelly-bean.jd b/docs/html/about/versions/jelly-bean.jd index cec1857300b86..db56fa42271ae 100644 --- a/docs/html/about/versions/jelly-bean.jd +++ b/docs/html/about/versions/jelly-bean.jd @@ -141,7 +141,7 @@ like those shown in the examples above to display rich content and actions.

  • BigPictureStyle — a notification that showcases visual content such as a bitmap.
    • -

    In addition to the templated styles, you can create you own notification styles using any remote View.

    +

    In addition to the templated styles, you can create your own notification styles using any remote View.

    Apps can add up to three actions to a notification, which are displayed below the notification content. The actions let the users respond directly to the information in the notification in alternative ways. such as by email or by phone call, without visiting the app.

    @@ -243,17 +243,17 @@ style="font-weight:500;">App Widgets can resize automatically to fit the

    In Android 4.1, Android Beam makes it easier to share images, videos, or other payloads by leveraging Bluetooth for the data transfer. When the user triggers a transfer, Android Beam hands over from NFC to Bluetooth, making it really easy to manage the transfer of a file from one device to another.

    -

    Wi-fi Network Service Discovery

    +

    Wi-Fi Network Service Discovery

    Android 4.1 introduces support for multicast DNS-based service discovery, which lets applications find and connect to services offered by peer devices over Wi-Fi networks — including mobile devices, printers, cameras, media players, and others. Developers can take advantage of Wi-Fi network service discovery to build cross-platform or multiplayer games and application experiences.

    Using the service discovery API, apps can create and register any kind of service, for any other NSD-enabled device to discover. The service is advertised by multicast across the network using a human-readable string identifier, which lets user more easily identify the type of service.

    -

    Consumer devices can use the API to scan and discover services available from devices connected to the local Wi-Fi network. After discovery, apps can use the API to resolve the service to an IP adress and port through which it can establish a socket connection.

    +

    Consumer devices can use the API to scan and discover services available from devices connected to the local Wi-Fi network. After discovery, apps can use the API to resolve the service to an IP address and port through which it can establish a socket connection.

    You can take advantage of this API to build new features into your apps. For example, you could let users connect to a webcam, a printer, or an app on another mobile device that supports Wi-Fi peer-to-peer connections.

    -

    Wifi-Direct Service Discovery

    +

    Wi-Fi Direct Service Discovery

    Ice Cream Sandwich introduced support for Wi-Fi Direct, a technology that lets apps discover and pair directly, over a high-bandwidth peer-to-peer connection. Wi-Fi Direct is an ideal way to share media, photos, files and other types of data and sessions, even where there is no cell network or Wi-Fi available.

    diff --git a/docs/html/distribute/googleplay/promote/brand.jd b/docs/html/distribute/googleplay/promote/brand.jd index 8aafc48fe3dd4..8d049030b675e 100644 --- a/docs/html/distribute/googleplay/promote/brand.jd +++ b/docs/html/distribute/googleplay/promote/brand.jd @@ -93,19 +93,19 @@ any way you want, provided that you follow the guidelines described below.

    - Google Play logo + Google Play logo

    Get it on Google Play badge, large
    - Download: Small | Large + "http://www.android.com/images/brand/get_it_on_play_logo_large.png">
    + Download: Small | Large

    Android App on Google Play badge, large
    - Download: Small | - Large + "http://www.android.com/images/brand/android_app_on_play_logo_large.png">
    + Download: Small | + Large

    @@ -140,20 +140,20 @@ any way you want, provided that you follow the guidelines described below.