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

Commit f0bd433f authored by sreevanis's avatar sreevanis Committed by android-build-merger
Browse files

Merge "Updated link to material design page." into mnc-io-docs am: 26aea138 am: 890101cc 

am: 625f97ba

* commit '625f97ba':
  Updated link to material design page.

Change-Id: I4f295c8b35d7a7093ef48c58428ce43b27dd2502
parents 84640a77 625f97ba

docs/html/wear/preview/api-overview.jd

+1 −1
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ see <a href="{@docRoot}wear/preview/features/complications.html"> 
  "{@docRoot}training/wearables/notifications/pages.html">specify additional

  content pages</a> and actions for a notification, those are available to the

  user within the expanded notification. Each expanded notification follows

  <a href="https://google.com/design/wear">Material Design for Android

  <a href="https://google.com/design/spec-wear">Material Design for Android

  Wear</a>, so the user gets an app-like experience.

</p>

docs/html/wear/preview/features/notifications.jd

+3 −3
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ page.image=/wear/preview/images/expanded_diagram.png 


<h2 id="visual">Visual Updates</h2>

<p>Notifications receive important visual updates in Wear 2.0, with

<a href="http://www.google.com/design/wear">

<a href="http://www.google.com/design/spec-wear">

material design</a> visual changes.

</p>
@@ -84,7 +84,7 @@ material design</a> visual changes. 
<p>When you <a href="{@docRoot}training/wearables/notifications/pages.html">specify additional content pages</a>

 and actions for a notification, those are available to the user within the 

 expanded notification. Each expanded notification follows 

 <a href="http://www.google.com/design/wear">Material Design for Android Wear</a>,

 <a href="http://www.google.com/design/spec-wear">Material Design for Android Wear</a>,

  so the user gets an app-like experience.

</p>

<p><img src="{@docRoot}wear/preview/images/expanded_diagram.png" /> </p>
@@ -190,7 +190,7 @@ following: 
  <li>Use <a href="{@docRoot}preview/features/notification-updates.html#style">{@code Notification.MessagingStyle}</a>.

  </li>

  <li>Call the method 

  <a href="https://android-dot-devsite.googleplex.com/wear/preview/start.html#get_the_preview_reference_documentation">{@code setAllowGeneratedReplies()}</a>

  <a href="{@docRoot}wear/preview/start.html#get_the_preview_reference_documentation">{@code setAllowGeneratedReplies()}</a>

   for the notification action.</li>

  <li>Ensure that the notification action has a

    <a href="{@docRoot}reference/android/app/RemoteInput.html">{@code RemoteInput}</a>

docs/html/wear/preview/features/ui-nav-actions.jd

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ page.image=/wear/preview/images/card_drawer.png 


</div>

</div>

<p>As part of the <a href="http://www.google.com/design/wear">Material Design</a>

<p>As part of the <a href="http://www.google.com/design/spec-wear">Material Design</a>

 for Android Wear, Wear 2.0 adds interactive navigation and action drawers. 

 The navigation drawer appears at the top of the screen and lets users jump to 

 different views within

docs/html/wear/preview/index.jd

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ footer.hide=1 
          <span class="dac-sprite dac-auto-chevron"></span>

          Learn about the Preview

        </a>

        <a class="dac-hero-cta" href="https://www.google.com/design/wear">

        <a class="dac-hero-cta" href="https://www.google.com/design/spec-wear">

          <span class="dac-sprite dac-auto-chevron"></span>

          Material Design for Wear

        </a>