diff options
Diffstat (limited to 'docs/html')
| -rw-r--r-- | docs/html/guide/topics/resources/providing-resources.jd | 9 | ||||
| -rw-r--r-- | docs/html/preview/download.jd | 2 | ||||
| -rw-r--r-- | docs/html/training/auto/start/index.jd | 2 | ||||
| -rw-r--r-- | docs/html/training/building-userinfo.jd | 8 | ||||
| -rw-r--r-- | docs/html/training/contacts-provider/retrieve-names.jd | 1 | ||||
| -rw-r--r-- | docs/html/training/sign-in/index.jd | 50 | ||||
| -rw-r--r-- | docs/html/training/training_toc.cs | 2 |
7 files changed, 31 insertions, 43 deletions
diff --git a/docs/html/guide/topics/resources/providing-resources.jd b/docs/html/guide/topics/resources/providing-resources.jd index 6f9545d..68c44a4 100644 --- a/docs/html/guide/topics/resources/providing-resources.jd +++ b/docs/html/guide/topics/resources/providing-resources.jd @@ -646,7 +646,8 @@ application during runtime.</p> <code>xxhdpi</code><br/> <code>xxxhdpi</code><br/> <code>nodpi</code><br/> - <code>tvdpi</code> + <code>tvdpi</code><br/> + <code>anydpi</code> </td> <td> <ul class="nolist"> @@ -667,7 +668,11 @@ to match the device density.</li> <li>{@code tvdpi}: Screens somewhere between mdpi and hdpi; approximately 213dpi. This is not considered a "primary" density group. It is mostly intended for televisions and most apps shouldn't need it—providing mdpi and hdpi resources is sufficient for most apps and -the system will scale them as appropriate. This qualifier was introduced with API level 13.</li> +the system will scale them as appropriate. <em>Added in API Level 13</em></li> + <li>{@code anydpi}: This qualifier matches all screen densities and takes precedence over +other qualifiers. This is useful for +<a href="{@docRoot}training/material/drawables.html#VectorDrawables">vector drawables</a>. +<em>Added in API Level 21</em></li> </ul> <p>There is a 3:4:6:8:12:16 scaling ratio between the six primary densities (ignoring the tvdpi density). So, a 9x9 bitmap in ldpi is 12x12 in mdpi, 18x18 in hdpi, 24x24 in xhdpi and so on. diff --git a/docs/html/preview/download.jd b/docs/html/preview/download.jd index ecc0c7e..d00f90cbf 100644 --- a/docs/html/preview/download.jd +++ b/docs/html/preview/download.jd @@ -164,7 +164,7 @@ This is the Android SDK Preview License Agreement (the “License Agreement”). <div id="qv"> <h2>In this document</h2> <ol> - <li><a href="#sdk">Developer Preview 3 SDK</a></li> + <li><a href="#sdk">Android 6.0 SDK</a></li> <li><a href="#docs">Developer Documentation</a></li> <li><a href="#images">Hardware System Images</a></li> </ol> diff --git a/docs/html/training/auto/start/index.jd b/docs/html/training/auto/start/index.jd index f6cdbd1..6c6f188 100644 --- a/docs/html/training/auto/start/index.jd +++ b/docs/html/training/auto/start/index.jd @@ -177,7 +177,7 @@ more information, see href="https://play.google.com/store/apps/details?id=com.google.android.projection.gearhead&hl=en" >Android Auto app</a> on the mobile device.</li> <li>Open the <a href="{@docRoot}tools/help/sdk-manager.html">SDK Manager</a> and - download the DHU package <strong>Android Auto Desktop Head Unit</strong> from the + download the DHU package <strong>Android Auto Desktop Head Unit emulator</strong> from the <em>SDK Tools</em> tab. The DHU installs in the <code><sdk>/extras/google/auto/</code> directory.</li> <li>If you are running the DHU on Linux, you must also install diff --git a/docs/html/training/building-userinfo.jd b/docs/html/training/building-userinfo.jd index f9d77f7..40e5b94 100644 --- a/docs/html/training/building-userinfo.jd +++ b/docs/html/training/building-userinfo.jd @@ -1,9 +1,9 @@ -page.title=Building Apps with User Info & Location +page.title=Building Apps with Contacts & Sign-In page.trainingcourse=true @jd:body -<p>These classes teach you how to add user personalization to your app. Some of the ways -you can do this is by identifying users, providing -information that's relevant to them, and providing information about the world around them.</p>
\ No newline at end of file +<p>These lessons teach you how to include contact information and authenticate users with the same +credentials they use for Google. These features allow your app to connect users with people they +care about and provide a personalized experience without creating new user accounts.</p> diff --git a/docs/html/training/contacts-provider/retrieve-names.jd b/docs/html/training/contacts-provider/retrieve-names.jd index 7106889..d97b81b 100644 --- a/docs/html/training/contacts-provider/retrieve-names.jd +++ b/docs/html/training/contacts-provider/retrieve-names.jd @@ -731,7 +731,6 @@ public class ContactsFragment extends Fragment implements Define ListView and item layouts. </li> <li> - <li> Define a Fragment that displays the list of contacts. </li> <li> diff --git a/docs/html/training/sign-in/index.jd b/docs/html/training/sign-in/index.jd index 9d49fd9..d7c8e1d 100644 --- a/docs/html/training/sign-in/index.jd +++ b/docs/html/training/sign-in/index.jd @@ -1,5 +1,5 @@ page.title=Adding Sign-In -page.tags=authentication,signin,social,google+ +page.tags=authentication,signin page.article=true page.trainingcourse=true @jd:body @@ -11,13 +11,13 @@ page.trainingcourse=true alt="Google maps sample image"> <p> - The Google+ platform for Android lets you authenticate a user with the same credentials they use - on Google every day. Once a user signs in with Google, you can create more engaging experiences - and drive usage of your app. + Google Sign-In for Android lets you authenticate a user with the same credentials they use on + Google. After a user signs in with Google, you can create more engaging experiences and drive + usage of your app. </p> <p> - The <a href="https://developers.google.com/+/mobile/android/">Google+ Android API</a> allows + The <a href="https://developers.google.com/identity/sign-in/android/">Google Android API</a> allows you to integrate sign-in and social features into your app. </p> @@ -26,43 +26,27 @@ page.trainingcourse=true <h4>Trusted authentication</h4> <p> - Google+ Sign-In is a simple, trusted, and secure way to let people sign in to your app with their - Google credentials and bring along their Google+ info.<br> - <a href="https://developers.google.com/+/mobile/android/sign-in" class="external-link">Add - sign-in</a>. + Google Sign-In is a simple, trusted, and secure way to let people sign in to your app with their + Google credentials.<br> + <a href="https://developers.google.com/identity/sign-in/android/sign-in" class="external-link">Add + Sign-in</a>. </p> <h4>Access the profile and social graph</h4> <p> - Once users have signed in with Google, your app can welcome them by name, display their picture, - connect them with friends, and lots more.<br> - <a href="https://developers.google.com/+/mobile/android/people" class="external-link">Access the - social graph</a>. -</p> - -<h4>Stand out in the stream</h4> -<p> - Interactive posts is a rich way of sharing to Google+. It lets users prompt friends to take - specific actions in your app from a Google+ post, like "listen," "RSVP," "check-in," and over 100 - more actions.<br> - <a class="external-link" href="https://developers.google.com/+/mobile/android/share">Post - interactive content</a>. -</p> - -<h4>Recommend content</h4> -<p> - Add a native +1 button so users can recommend content from your app. These endorsements can give - your app more credibility and help it grow faster.<br> - <a class="external-link" href="https://developers.google.com/+/mobile/android/recommend">Add the - +1 button</a>. + After users have signed in with Google, your app can welcome them by name and display their + picture. If your app requests social scopes, it can connect users with friends, and access + age range, language, and public profile information.<br> + <a href="https://developers.google.com/identity/sign-in/android/people" class="external-link"> + Getting Profile Information</a>. </p> <h2 id="start">Get Started</h2> <p> - The Google+ Android APIs are part of the Google Play services platform. To use Google+ features, + The Google Android APIs are part of the Google Play services platform. To use Google features, set up the Google Play services SDK in your app development project. For more information, see the <a class="external-link" href= - "https://developers.google.com/+/mobile/android/getting-started">Getting Started</a> guide for - the Google+ Platform for Android + "https://developers.google.com/identity/sign-in/android/start-integrating">Start Integrating</a> + guide for Google Sign-In. </p>
\ No newline at end of file diff --git a/docs/html/training/training_toc.cs b/docs/html/training/training_toc.cs index 7cffdd8..2963345 100644 --- a/docs/html/training/training_toc.cs +++ b/docs/html/training/training_toc.cs @@ -811,7 +811,7 @@ include the action bar on devices running Android 2.1 or higher." <div class="nav-section-header"> <a href="<?cs var:toroot ?>training/building-userinfo.html"> <span class="small">Building Apps with</span><br/> - User Info & Sign-In + Contacts & Sign-In </a> </div> <ul> |