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

Commit 72e18628 authored by destradaa's avatar destradaa Committed by Android Git Automerger
Browse files

Merge branch 'klp-modular-dev' of...

Merge branch 'klp-modular-dev' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-modular-dev
parents 017ec80f 8f414479
Loading
Loading
Loading
Loading
+18 −0
Original line number Diff line number Diff line
@@ -73,6 +73,24 @@ preferably from your mobile browser:</p>
<img style="margin-top:40px" src="/preview/images/opt-in.png"></li>
</ol>
<h2 style="margin-bottom: 0px;">3. Start Building</h2><hr>

<p>The Google Play services SDK is required if you want to sync and send data between wearable
and handheld devices. To get the new SDK that is compatible with the Google Play services
APK that you just installed, follow these steps: </p>

<p class="note"><b>Note:</b> We highly recommend you use Android Studio for Wear development.</p>
<ol>
  <li>Start AVD Manager.</li>
  <li>Update the Android SDK Tools and Platform-tools to versions 23 and 20 respectively.</li>
  <li>Click <b>Tools > Manage Add-on Sites > User Defined Sites</b>.</li>
  <li>Click <b>New</b>, enter
  <code>https://dl-ssl.google.com/android/repository/addon-play-services-5.xml</code> into the
  text field, and click <b>OK</b>.</li>
  <li>Click Close. You should now see new emulator images that support this preview
  release of Google Play services and the Google Play services client libraries you need to
  start developing.</li>
</ol>

<p>Check out the <a href="/training/building-wearables">Building Apps for Wearables</a>
training classes for information on how to build for Wear.</p>
    </div>
+3 −3
Original line number Diff line number Diff line
@@ -93,9 +93,9 @@
      <a href="<?cs var:toroot ?>preview/license.html">License Agreement</a>
      </div>
  </li>
  <li class="nav-section" style="margin: 20px 0 0 3px;">
    <div class="nav-section-header paging-links empty">
      <a href="<?cs var:toroot ?>index.html" class="prev-page-link">Developer Home</a>
  <li class="nav-section" style="margin: 20px 0 0 -10px;">
    <div class="nav-section-header empty">
      <a href="<?cs var:toroot ?>index.html" class="back-link">Developer Home</a>
      </div>
  </li>
</ul>
+233 −13

File changed.

Preview size limit exceeded, changes collapsed.

+135 −53

File changed.

Preview size limit exceeded, changes collapsed.