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

Commit c630dd30 authored by Bert McMeen's avatar Bert McMeen Committed by android-build-merger
Browse files

Merge \\\\"Docs: Information on OTA updates\\\\" into mnc-io-docs am:... 

Merge \\\\"Docs: Information on OTA updates\\\\" into mnc-io-docs am: 2f297621 am: 1dee5f4d am: d8c8d710
am: 8e17ac60

Change-Id: I4594f6e3d5eb52630709db2b04a983264d87b344
parents 099fc398 8e17ac60

docs/html/wear/preview/downloads.jd

+15 −10
Original line number Original line Diff line number Diff line
@@ -223,8 +223,8 @@ This is the Android Wear SDK Preview License Agreement (the “License Agreement 
    </p>

    </p>





    <p class="warning">

    <p class="warning">

      <strong>Warning:</strong> Installing a system image on a watch removes all data from the

      <strong>Warning:</strong> Installing a system image on a watch removes all

      watch, so you should back up your data first.

      data from the watch, so you should back up your data first.

    </p>

    </p>





    <h3 id="preview_system_images">

    <h3 id="preview_system_images">
@@ -233,8 +233,13 @@ This is the Android Wear SDK Preview License Agreement (the “License Agreement 




    <p>

    <p>

      The preview includes system images for testing your app. Based on your

      The preview includes system images for testing your app. Based on your

      device, you can download a preview system image from the following tables

      device, you can download a preview system image from one of the

      and flash it to the corresponding device.

      following tables and flash it to the corresponding device.

    </p>



    <p>

      To restore your device to its original state during the preview,

      you can flash the appropriate retail system image, below, to the device.

    </p>

    </p>





    <h4 id="preview_image_for_lge_watch_urbane_2nd_edition">

    <h4 id="preview_image_for_lge_watch_urbane_2nd_edition">
@@ -261,9 +266,9 @@ This is the Android Wear SDK Preview License Agreement (the “License Agreement 
        <td>

        <td>

          Preview image for testing

          Preview image for testing

        </td>

        </td>

        <td><a href="#top" onclick="onDownload(this)">nemo-nvd36i-factory-9cdd2ac0.tgz</a><br>

        <td><a href="#top" onclick="onDownload(this)">nemo-nvd83h-factory-48ac950c.tgz</a><br>

          MD5: b33ba8e59780fbe5c83d8936b108640f<br>

          MD5: dd351884cce9fb5bf1bdec0a8e5f56e3<br>

          SHA-1: 9cdd2ac01f2976cafe5a21958298dac159b7a325

          SHA-1: 48ac950c48faef96a7770e3c1acb56d23a28d859

        </td>

        </td>

      </tr>

      </tr>
@@ -302,9 +307,9 @@ This is the Android Wear SDK Preview License Agreement (the “License Agreement 
        <td>

        <td>

          Preview image for testing

          Preview image for testing

        </td>

        </td>

        <td><a href="#top" onclick="onDownload(this)">sturgeon-nvd36i-factory-2cbe5080.tgz</a><br>

        <td><a href="#top" onclick="onDownload(this)">sturgeon-nvd83h-factory-cb5a11ab.tgz</a><br>

          MD5: ccc972cdc33cba778a2f624066ef5713<br>

          MD5: 38c1047992b1d28f6833d9f6c8470cdc<br>

          SHA-1: 2cbe5080ded060ce43ba65ff27e2290b28981634

          SHA-1: cb5a11ab0260ea3ca7da5894e73e41f70357da6b

        </td>

        </td>

      </tr>

      </tr>

      <tr id="sturgeon-non-preview">

      <tr id="sturgeon-non-preview">

docs/html/wear/preview/program.jd

+18 −5
Original line number Original line Diff line number Diff line
@@ -79,6 +79,11 @@ page.image=images/cards/card-n-sdk_2x.png 
          </div>

          </div>





          <div class="col-4of12">

          <div class="col-4of12">

            <h5>

            </h5>



            <p>

            </p>

          </div>

          </div>

        </div>

        </div>

      </div>

      </div>
@@ -90,7 +95,7 @@ page.image=images/cards/card-n-sdk_2x.png 




    <p>

    <p>

      The Android Wear 2.0 Developer Preview runs from 18 May 2016 until the

      The Android Wear 2.0 Developer Preview runs from 18 May 2016 until the

      final Android Wear public release to OEMs, planned for Q4 2016.

      final Android Wear public release to OEMs.

    </p>

    </p>





    <p>

    <p>
@@ -136,7 +141,7 @@ page.image=images/cards/card-n-sdk_2x.png 
    </p>

    </p>





    <p>

    <p>

      At milestones 4 and 5 you'll have access to the final Android Wear 2.0

      At milestone 4, you'll have access to the final Android Wear 2.0

      APIs and SDK to develop with, as well as near-final system images to test

      APIs and SDK to develop with, as well as near-final system images to test

      system behaviors and features. Android Wear 2.0 will use the Android N

      system behaviors and features. Android Wear 2.0 will use the Android N

      API level at this time. You can begin final compatibility testing of your

      API level at this time. You can begin final compatibility testing of your
@@ -196,9 +201,9 @@ page.image=images/cards/card-n-sdk_2x.png 
    </h3>

    </h3>





    <p>

    <p>

      You can download these hardware system images at <a href=

      You can download these hardware system images from the <a href=

      "{@docRoot}wear/preview/downloads.html">Download and Test with a

      "{@docRoot}wear/preview/downloads.html">Download and Test with a

      Device</a>:

      Device</a> page:

    </p>

    </p>





    <ul>

    <ul>
@@ -210,7 +215,15 @@ page.image=images/cards/card-n-sdk_2x.png 
    </ul>

    </ul>





    <p>

    <p>

     Please keep in mind that the Developer Preview system images

     To restore your device to its

     original state during the preview, you can flash the

     appropriate retail system image from

     the <a href="{@docRoot}wear/preview/downloads.html">Download and

     Test with a Device</a> page.

    </p>



    <p>

     Please keep in mind that the preview system images

     are for app developers only, and for compatibility testing and

     are for app developers only, and for compatibility testing and

     early development only, and are not ready for day-to-day use.

     early development only, and are not ready for day-to-day use.

    </p>

    </p>

docs/html/wear/preview/start.jd

+36 −15
Original line number Original line Diff line number Diff line
@@ -107,10 +107,10 @@ page.image=images/cards/card-n-sdk_2x.png 




      <tr>

      <tr>

        <td>

        <td>

          <a href="http://storage.googleapis.com/androiddevelopers/shareables/wear-preview/wearable-support-preview-1-docs.zip">wearable-support-preview-1-docs.zip</a>

          <a href="http://storage.googleapis.com/androiddevelopers/shareables/wear-preview/wearable-support-preview-2-docs.zip">wearable-support-preview-2-docs.zip</a>

        </td>

        </td>

        <td>MD5: 02f9dc7714c00076b323c9081655c3b2<br>

        <td>MD5: afb770c9c5c0431bbcbdde186f1eae06<br>

            SHA-1: 075f3821ee9b66a919a0e8086f79c12bc9576fb2

            SHA-1: 81d681e61cee01f222ea82e83297d23c4e55b8f3

        </td>

        </td>

      </tr>

      </tr>

    </table>

    </table>
@@ -146,16 +146,26 @@ page.image=images/cards/card-n-sdk_2x.png 
      plugin.

      plugin.

      </li>

      </li>





      <li>In the <code>build.gradle</code> file for the Wear module, in the

      <li>In the <code>build.gradle</code> file for the Wear module:

      <code>dependencies</code> section, update the existing reference to the

      <ul>

        <li>In the <code>android</code> section, update the

        <code>compileSdkVersion</code> to 24.

        </li>



        <li>In the <code>android</code> section, update the

        <code>targetSdkVersion</code> to 24.

        </li>



        <li>In the <code>dependencies</code> section, update

      the existing reference to the

      Wearable Support Library (for example, <code>compile

      Wearable Support Library (for example, <code>compile

      'com.google.android.support:wearable:1.4.0'</code>) by changing it to the

      'com.google.android.support:wearable:1.4.0'</code>) by changing it to the

      following, which requires that your the Google Repository <a href=

      following, which requires that your the Google Repository <a href=

      "#install_android_studio_and_the_latest_packages">is the latest

      "#install_android_studio_and_the_latest_packages">is the latest

      version</a>:

      version</a>:

      <pre>

      <code>compile 'com.google.android.support:wearable:2.0.0-alpha2'</code>

compile 'com.google.android.support:wearable:2.0.0-alpha1'

        </li>

      </pre>

      </ul>

      </li>

      </li>





      <li>See the following page for setting up a watch or emulator with a

      <li>See the following page for setting up a watch or emulator with a
@@ -190,13 +200,24 @@ compile 'com.google.android.support:wearable:2.0.0-alpha1' 
      wizard.

      wizard.

      </li>

      </li>





      <li>In the <code>build.gradle</code> file for the Wear module, in the

      <li>In the <code>build.gradle</code> file for the Wear module:

      <code>dependencies</code> section, update the existing reference to the

      <ul>

      Wearable Support Library (perhaps <code>compile

        <li>In the <code>android</code> section, update the

      'com.google.android.support:wearable:1.4.0'</code>) to:

        <code>compileSdkVersion</code> to 24.

      <pre>

        </li>

compile 'com.google.android.support:wearable:2.0.0-alpha1'

        <li>In the <code>android</code> section, update the

      </pre>

        <code>targetSdkVersion</code> to 24.

        </li>

        <li>In the <code>dependencies</code> section, update

      the existing reference to the

      Wearable Support Library (for example, <code>compile

      'com.google.android.support:wearable:1.4.0'</code>) by changing it to the

      following, which requires that your the Google Repository <a href=

      "#install_android_studio_and_the_latest_packages">is the latest

      version</a>:

      <code>compile 'com.google.android.support:wearable:2.0.0-alpha2'</code>

        </li>

      </ul>

      </li>

      </li>





      <li>See the following page for setting up a watch or emulator with a

      <li>See the following page for setting up a watch or emulator with a