Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 712c7ea3 authored by Luan Nguyen's avatar Luan Nguyen Committed by Android (Google) Code Review
Browse files

Merge "cherrypick from klp-modular-docs docs: make fixes to Wear training... 

Merge "cherrypick from klp-modular-docs docs: make fixes to Wear training material Change-Id: I27c2c754a027f7202a6388a60008ad3a594132c4" into lmp-docs
parents 1d295821 bcb15cc1

docs/html/training/wearables/apps/bt-debugging.jd

+2 −2
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ page.title=Debugging over Bluetooth 
  </div>

</div>



<p>You can debug your wearable over Bluetooth by routing it's debug output to the

<p>You can debug your wearable over Bluetooth by routing its debug output to the

handheld device that's connected to your development machine.</p>



<h2 id="SetupDevices">Setup Devices for Debugging</h2>

docs/html/training/wearables/apps/creating.jd

+5 −0
Original line number Diff line number Diff line
@@ -92,6 +92,11 @@ types of screen shapes, which is useful for testing.</p> 
  <li>Leave the Android Wear app open on your phone.</li>

  <li>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.</li>

  <p class="note"><strong>Note:</strong> If you can not connect your wearable to your machine via USB,

  follow the directions on

  <a href="{@docRoot}training/wearables/apps/bt-debugging.html">Debugging over

  Bluetooth</a>.

  </p>

  <li>On the Android Wear app, check <strong>Always allow from this computer</strong> and tap

  <strong>OK</strong>.</li>

</ol>

docs/html/training/wearables/apps/index.jd

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ in ADT. The rest of this training assumes you're using Android Studio. 
      <dd>Learn how to create and display custom layouts for notifications and

      activities.</dd>

    <dt><a href="{@docRoot}training/wearables/apps/voice.html">Adding Voice Capabilities</a></dt>

      <dd>Learn how to launch an activity with a voice actions and how to start the

      <dd>Learn how to launch an activity with voice actions and how to start the

      system speech recognizer app to obtain free-form voice input.</dd>

    <dt><a href="{@docRoot}training/wearables/apps/packaging.html">Packaging Wearable Apps</a></dt>

      <dd>Learn how to package a wearable app inside a

docs/html/training/wearables/data-layer/accessing.jd

+3 −3
Original line number Diff line number Diff line
@@ -12,9 +12,9 @@ page.title=Accessing the Wearable Data Layer 


<h2>Dependencies and Prerequisites</h2>

<ol>

  <li><a href="{@docRoot}training/wearables/apps/environment.html">Creating

  Wearable Apps > Setting up Your Environment</a></li>

  <li><a href="{@docRoot}training/wearables/apps/creating.html">Creating

  <li><a href="{@docRoot}training/wearables/apps/creating.html#SetupEmulator">Creating

  Wearable Apps > Set Up an Android Wear Emulator or Device</a></li>

  <li><a href="{@docRoot}training/wearables/apps/creating.html#CreateProject">Creating

    Wearable Apps > Creating a Project</a></li>

</ol>

</div>

docs/html/training/wearables/data-layer/data-items.jd

+4 −4
Original line number Diff line number Diff line
@@ -47,14 +47,14 @@ directly. Instead, you: 


<p>

However, instead of working with raw bytes using <a href="{@docRoot}reference/com/google/android/gms/wearable/PutDataRequest.html#setData(byte[])">setData()</a>,

we recommend you <a href="#data-map">use a data map</a>, which exposes

we recommend you <a href="#SyncData">use a data map</a>, which exposes

a data item in an easy-to-use {@link android.os.Bundle}-like interface.

</p>



<h2 id="SyncData">Sync Data with a Data Map</h2>

<p>

When possible, use the <a href="{@docRoot}reference/com/google/android/gms/wearable/DataMap.html"><code>DataMap</code></a> class,

which lets you work with data items in the form of an Android {@link android.os.Bundle},

When possible, use the <a href="{@docRoot}reference/com/google/android/gms/wearable/DataMap.html"><code>DataMap</code></a> 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.

</p>
@@ -120,5 +120,5 @@ public void onDataChanged(DataEventBuffer dataEvents) { 
<p>

This is just a snippet that requires more implementation details. Learn about

how to implement a full listener service or activity in

<a href="{@docRoot}training/wearables/data-layer/events.html">Listening for Data Layer Events</a>.

<a href="{@docRoot}training/wearables/data-layer/events.html#Listen">Listening for Data Layer Events</a>.

</p>
 
 No newline at end of file