Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 625f97ba3b

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

Change-Id: I4f295c8b35d7a7093ef48c58428ce43b27dd2502
This commit is contained in:
sreevanis
2016-05-18 19:58:08 +00:00
committed by android-build-merger
parent 84640a7704 625f97ba3b
commit f0bd433ff5
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/html/wear/preview/api-overview.jd
View File

@@ -138,7 +138,7 @@ see <a href="{@docRoot}wear/preview/features/complications.html">
"{@docRoot}training/wearables/notifications/pages.html">specify additional "{@docRoot}training/wearables/notifications/pages.html">specify additional
content pages</a> and actions for a notification, those are available to the content pages</a> and actions for a notification, those are available to the
user within the expanded notification. Each expanded notification follows 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. Wear</a>, so the user gets an app-like experience.
</p> </p>

6
docs/html/wear/preview/features/notifications.jd
View File

@@ -36,7 +36,7 @@ page.image=/wear/preview/images/expanded_diagram.png
<h2 id="visual">Visual Updates</h2> <h2 id="visual">Visual Updates</h2>
<p>Notifications receive important visual updates in Wear 2.0, with <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. material design</a> visual changes.
</p> </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> <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 and actions for a notification, those are available to the user within the
expanded notification. Each expanded notification follows 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. so the user gets an app-like experience.
</p> </p>
<p><img src="{@docRoot}wear/preview/images/expanded_diagram.png" /> </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>Use <a href="{@docRoot}preview/features/notification-updates.html#style">{@code Notification.MessagingStyle}</a>.
</li> </li>
<li>Call the method <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> for the notification action.</li>
<li>Ensure that the notification action has a <li>Ensure that the notification action has a
<a href="{@docRoot}reference/android/app/RemoteInput.html">{@code RemoteInput}</a> <a href="{@docRoot}reference/android/app/RemoteInput.html">{@code RemoteInput}</a>

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

@@ -36,7 +36,7 @@ page.image=/wear/preview/images/card_drawer.png
</div> </div>
</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. 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 The navigation drawer appears at the top of the screen and lets users jump to
different views within different views within

2
docs/html/wear/preview/index.jd
View File

@@ -35,7 +35,7 @@ footer.hide=1
<span class="dac-sprite dac-auto-chevron"></span> <span class="dac-sprite dac-auto-chevron"></span>
Learn about the Preview Learn about the Preview
</a> </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> <span class="dac-sprite dac-auto-chevron"></span>
Material Design for Wear Material Design for Wear
</a> </a>