diff --git a/docs/html/training/wearables/apps/bt-debugging.jd b/docs/html/training/wearables/apps/bt-debugging.jd index 98cf804762a77..7569e7e27f863 100644 --- a/docs/html/training/wearables/apps/bt-debugging.jd +++ b/docs/html/training/wearables/apps/bt-debugging.jd @@ -19,7 +19,7 @@ page.title=Debugging over Bluetooth -

You can debug your wearable over Bluetooth by routing it's debug output to the +

You can debug your wearable over Bluetooth by routing its debug output to the handheld device that's connected to your development machine.

Setup Devices for Debugging

@@ -90,4 +90,4 @@ adb -e <command> adb -e logcat adb -e shell adb -e bugreport - \ No newline at end of file + diff --git a/docs/html/training/wearables/apps/creating.jd b/docs/html/training/wearables/apps/creating.jd index 7252ada3e54f3..018d9f7175c69 100644 --- a/docs/html/training/wearables/apps/creating.jd +++ b/docs/html/training/wearables/apps/creating.jd @@ -92,6 +92,11 @@ types of screen shapes, which is useful for testing.

  • Leave the Android Wear app open on your phone.
  • Connect the wearable to your machine through USB, so you can install apps directly to it as you develop. A message appears on both the wearable and the Android Wear app prompting you to allow debugging.
  • +

    Note: If you can not connect your wearable to your machine via USB, + follow the directions on + Debugging over + Bluetooth. +

  • On the Android Wear app, check Always allow from this computer and tap OK.
  • diff --git a/docs/html/training/wearables/apps/index.jd b/docs/html/training/wearables/apps/index.jd index 256205bc7a05c..4bdd6bf70a16a 100644 --- a/docs/html/training/wearables/apps/index.jd +++ b/docs/html/training/wearables/apps/index.jd @@ -64,7 +64,7 @@ in ADT. The rest of this training assumes you're using Android Studio.
    Learn how to create and display custom layouts for notifications and activities.
    Adding Voice Capabilities
    -
    Learn how to launch an activity with a voice actions and how to start the +
    Learn how to launch an activity with voice actions and how to start the system speech recognizer app to obtain free-form voice input.
    Packaging Wearable Apps
    Learn how to package a wearable app inside a diff --git a/docs/html/training/wearables/data-layer/accessing.jd b/docs/html/training/wearables/data-layer/accessing.jd index bffd4c8026411..b7ecf5b2ffa73 100644 --- a/docs/html/training/wearables/data-layer/accessing.jd +++ b/docs/html/training/wearables/data-layer/accessing.jd @@ -12,9 +12,9 @@ page.title=Accessing the Wearable Data Layer

    Dependencies and Prerequisites

      -
    1. Creating - Wearable Apps > Setting up Your Environment
    2. -
    3. Creating +
    4. Creating + Wearable Apps > Set Up an Android Wear Emulator or Device
    5. +
    6. Creating Wearable Apps > Creating a Project
    diff --git a/docs/html/training/wearables/data-layer/data-items.jd b/docs/html/training/wearables/data-layer/data-items.jd index 63c32ea3a5f01..f843bb67f0504 100644 --- a/docs/html/training/wearables/data-layer/data-items.jd +++ b/docs/html/training/wearables/data-layer/data-items.jd @@ -47,14 +47,14 @@ directly. Instead, you:

    However, instead of working with raw bytes using setData(), -we recommend you use a data map, which exposes +we recommend you use a data map, which exposes a data item in an easy-to-use {@link android.os.Bundle}-like interface.

    Sync Data with a Data Map

    -When possible, use the DataMap class, -which lets you work with data items in the form of an Android {@link android.os.Bundle}, +When possible, use the DataMap class. +This approach lets you work with data items in the form of an Android {@link android.os.Bundle}, so object serialization and de-serialization is done for you, and you can manipulate data with key-value pairs.

    @@ -120,5 +120,5 @@ public void onDataChanged(DataEventBuffer dataEvents) {

    This is just a snippet that requires more implementation details. Learn about how to implement a full listener service or activity in -Listening for Data Layer Events. +Listening for Data Layer Events.

    \ No newline at end of file diff --git a/docs/html/training/wearables/data-layer/events.jd b/docs/html/training/wearables/data-layer/events.jd index 9e8acbc8ec6cf..9196a2c29e558 100644 --- a/docs/html/training/wearables/data-layer/events.jd +++ b/docs/html/training/wearables/data-layer/events.jd @@ -159,7 +159,7 @@ public class DataLayerListenerService extends WearableListenerService { } // Loop through the events and send a message - / to the node that created the data item. + // to the node that created the data item. for (DataEvent event : events) { Uri uri = event.getDataItem().getUri(); diff --git a/docs/html/training/wearables/data-layer/index.jd b/docs/html/training/wearables/data-layer/index.jd index 6ef3fc7ac6179..73d9ee598fb47 100644 --- a/docs/html/training/wearables/data-layer/index.jd +++ b/docs/html/training/wearables/data-layer/index.jd @@ -83,5 +83,3 @@ channel.
    Handling Data Layer Events
    Be notified of changes and events to the data layer.
    - - \ No newline at end of file diff --git a/docs/html/training/wearables/data-layer/messages.jd b/docs/html/training/wearables/data-layer/messages.jd index 71f1bb1dc5ce6..b3afacb8df5f5 100644 --- a/docs/html/training/wearables/data-layer/messages.jd +++ b/docs/html/training/wearables/data-layer/messages.jd @@ -27,7 +27,7 @@ Messages are a one-way communication mechanism that's good for remote procedure such as sending a message to the wearable to start an activity. You can also use messages in request/response model where one side of the connection sends a message, does some work, -sends back a response message.

    +and sends back a response message.

    Send a Message

    @@ -95,5 +95,5 @@ public void onMessageReceived(MessageEvent messageEvent) {

    This is just a snippet that requires more implementation details. Learn about how to implement a full listener service or activity in -Listening for Data Layer Events. +Listening for Data Layer Events.

    \ No newline at end of file diff --git a/docs/html/training/wearables/notifications/creating.jd b/docs/html/training/wearables/notifications/creating.jd index 84e3311aa997d..57ac36e01ac1e 100644 --- a/docs/html/training/wearables/notifications/creating.jd +++ b/docs/html/training/wearables/notifications/creating.jd @@ -4,7 +4,6 @@ page.title=Creating a Notification
    -

    This lesson teaches you to

    1. Import the Necessary Classes
    2. @@ -30,7 +29,6 @@ Notifications using {@link android.widget.RemoteViews} are stripped of custom layouts and the wearable only displays the text and icons. However, you can create create custom notifications that use custom card layouts by creating a wearable app that runs on the wearable device.

      -

    Import the necessary classes

    @@ -255,7 +253,7 @@ NotificationCompat.WearableExtender wearableExtender = Notification notif = new NotificationCompat.Builder(mContext) .setContentTitle("New mail from " + sender) .setContentText(subject) - .setSmallIcon(R.drawable.new_mail); + .setSmallIcon(R.drawable.new_mail) .extend(wearableExtender) .build(); @@ -278,7 +276,7 @@ method, in the res/drawable-hdpi directory of your handheld app.

    If you ever need to read wearable-specific options at a later time, use the corresponding get method for the option. This example calls the {@link android.support.v4.app.NotificationCompat.WearableExtender#getHintHideIcon()} method to -get whether or not this notification hides the icon: +get whether or not this notification hides the icon:

     NotificationCompat.WearableExtender wearableExtender =
             new NotificationCompat.WearableExtender(notif);
    @@ -304,14 +302,3 @@ notificationManager.notify(notificationId, notif);
     features from {@link android.support.v4.app.NotificationCompat.WearableExtender}
     do not work, so make sure to use {@link android.support.v4.app.NotificationCompat}.
     

    - -
    -NotificationCompat.WearableExtender wearableExtender =
    -        new NotificationCompat.WearableExtender(notif);
    -boolean hintHideIcon = wearableExtender.getHintHideIcon();
    - 
    - -

    The {@link android.support.v4.app.NotificationCompat.WearableExtender} APIs allow you to add -additional pages to notifications, stack notifications, and more. Continue to the following lessons -to learn about these features. -

    diff --git a/docs/html/training/wearables/notifications/index.jd b/docs/html/training/wearables/notifications/index.jd index a7b67333ff52b..2833dfa08dd41 100644 --- a/docs/html/training/wearables/notifications/index.jd +++ b/docs/html/training/wearables/notifications/index.jd @@ -49,5 +49,3 @@ swipes to the left.
    Learn how to place all similar notifications from your app in a stack, allowing users to view each notification individually without adding multiple cards to the card stream.
    - -
    \ No newline at end of file diff --git a/docs/html/training/wearables/notifications/stacks.jd b/docs/html/training/wearables/notifications/stacks.jd index 9a528a45962ed..9e70e1be827cd 100644 --- a/docs/html/training/wearables/notifications/stacks.jd +++ b/docs/html/training/wearables/notifications/stacks.jd @@ -87,7 +87,7 @@ notification and call {@link android.support.v4.app.NotificationCompat.Builder#s on the summary notification.

    This notification does not appear in your stack of notifications on the wearable, but -appears as the only notification on the handheld device.

    +it appears as the only notification on the handheld device.

     Bitmap largeIcon = BitmapFactory.decodeResource(getResources(),
    diff --git a/docs/html/training/wearables/notifications/voice-input.jd b/docs/html/training/wearables/notifications/voice-input.jd
    index 3ce1c8006d3f4..5a49343805098 100644
    --- a/docs/html/training/wearables/notifications/voice-input.jd
    +++ b/docs/html/training/wearables/notifications/voice-input.jd
    @@ -86,7 +86,7 @@ style="float:right;margin:0 0 20px 40px" />
      {@link android.support.v4.app.RemoteInput}:

    -public static final EXTRA_VOICE_REPLY = "extra_voice_reply";
    +public static final String EXTRA_VOICE_REPLY = "extra_voice_reply";
     ...
     String replyLabel = getResources().getString(R.string.reply_label);
     String[] replyChoices = getResources().getStringArray(R.array.reply_choices);
    @@ -116,7 +116,7 @@ PendingIntent replyPendingIntent =
     // Create the reply action and add the remote input
     NotificationCompat.Action action =
             new NotificationCompat.Action.Builder(R.drawable.ic_reply_icon,
    -                getString(R.string.label, replyPendingIntent))
    +                getString(R.string.label), replyPendingIntent)
                     .addRemoteInput(remoteInput)
                     .build();
     
    @@ -171,4 +171,4 @@ private CharSequence getMessageText(Intent intent) {
         }
         return null;
     }
    -
    \ No newline at end of file +