am 4240da1a: am 7cbf2bc6: Merge "docs: gms cheddar updates for g+" into jb-mr1-dev
* commit '4240da1a888edca033ca10b6995ea9c7df5c7e5b':
docs: gms cheddar updates for g+
diff --git a/docs/html/develop/index.jd b/docs/html/develop/index.jd
index beb5ac5..190a6d9 100644
--- a/docs/html/develop/index.jd
+++ b/docs/html/develop/index.jd
@@ -30,6 +30,24 @@
<a href="" class="slideshow-next">Next</a>
<div class="frame">
<ul>
+
+ <li class="item carousel-home">
+ <div class="col-8">
+ <img src="{@docRoot}images/google/gps-plus-signin-hero.jpg"
+class="play no-shadow no-transform" style="margin:0 0 0 40px;max-height:250px;height:250px;
+ max-width:409px;width:409px" />
+ </div>
+ <div class="content-right col-6" style="width:350px">
+ <h2>Google+ Sign-in for your Android Apps</h2>
+ <p>Google+ Sign-In is an easy, trusted way to sign a user into your app,
+ and get more Android installs when people visit your website.
+ When users sign in with Google on the web, they have the option to instantly
+ install your Android app without ever leaving your website.</p>
+ <p><a
+href="{@docRoot}google/play-services/plus.html" class="button">Read more</a></p>
+ </div>
+ </li>
+
<li class="item carousel-home">
<div class="col-8">
<img src="{@docRoot}images/google/maps-v2-trulia-n7.png"
@@ -87,24 +105,6 @@
more</a></p>
</div>
</li>
- <li class="item carousel-home">
- <div class="col-8">
- <img
-src="//lh4.ggpht.com/-g05If_eKKRQ/UAcrVLI-OYI/AAAAAAAAAr8/AWvunVb5S-w/s320/nexus7.png"
-class="play no-shadow no-transform" />
- </div>
- <div class="content-right col-6">
- <p class="title-intro">From the blog:</p>
- <h2>Getting Your App Ready for Jelly Bean and Nexus 7</h2>
- <p>For many people, their first taste of Jelly Bean will be on the beautiful
- <strong>Nexus 7 tablet</strong>. Most applications will run just fine on Nexus 7, but who wants
- their app to be just fine? Here are some tips for optimizing your app
- to make the most of this device.</p>
- <p><a
-href="http://android-developers.blogspot.com/2012/07/getting-your-app-ready-for-jelly-bean.html" class="button">Read
-more</a></p>
- </div>
- </li>
</ul>
</div>
</div>
@@ -307,8 +307,6 @@
}
}
-
-
/* This 'playlist' object defines the playlist IDs for each tab.
* Each name inside 'playlist' corresponds to class names for the tab that the playlists belong to (eg: "googleioTab" and "googleioBox" divs).
* Each string in 'ids' is the ID of a YouTube playlist that belongs in the corresponding tab.
diff --git a/docs/html/google/index.jd b/docs/html/google/index.jd
index 1c83e78..4020cf4 100644
--- a/docs/html/google/index.jd
+++ b/docs/html/google/index.jd
@@ -56,12 +56,14 @@
<div class="landing-cell">
<div class="cell-icon">
- <img src="{@docRoot}images/google/plus-one.png" width="40" >
+ <img src="{@docRoot}images/google/plus-logo.png" width="40" >
</div>
<h4><a href="{@docRoot}google/play-services/plus.html"
>Google+</a></h4>
- <p>Authenticate users and allow them to sign in, add +1 buttons so users can
- recommend your app content, and allow them to share your content on Google+.</p>
+ <p>Allow users to sign in with their Google account,
+ customize the user experience with Google+ info,
+ pull people into your app with interactive posts,
+ and add +1 buttons so users can recommend your content.</p>
</div>
<div class="landing-cell">
diff --git a/docs/html/google/play-services/plus.jd b/docs/html/google/play-services/plus.jd
index f65abb4..de921be 100644
--- a/docs/html/google/play-services/plus.jd
+++ b/docs/html/google/play-services/plus.jd
@@ -12,17 +12,14 @@
<div class="col-6">
<h1 itemprop="name" style="margin-bottom:0;">Google+ Platform for Android</h1>
- <p itemprop="description">Create an engaging social experience
- by integrating Google+ features in your app. You can <b>authenticate users</b> and allow them to
- <b>sign in</b>, add +1 buttons so users can <b>recommend your app content</b>,
- and allow users to <b>share rich content</b> with Google+.</p>
+ <p itemprop="description">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.</p>
- <p>The <a
-href="{@docRoot}reference/com/google/android/gms/plus/package-summary.html"
->Google+ Android API reference</a> is available here on developer.android.com, but for more
-information about integrating Google+, visit:</p>
-<p><a class="external-link"
-href="https://developers.google.com/+/mobile/android/">developers.google.com/+</a></p>
+ <p>Check out the <a href="{@docRoot}reference/com/google/android/gms/plus/package-summary.html"
+>Google+ Android API reference</a> and visit <a class="external-link"
+href="https://developers.google.com/+/mobile/android/">developers.google.com/+</a> for more
+information about integrating Google+ into your app.</p>
</div>
</div>
@@ -30,22 +27,31 @@
<div class="col-6 normal-links">
<h3 style="clear:left">Key Developer Features</h3>
- <h4>Sign in with Google+</h4>
- <p>Allow users to easily and securely sign in to your app using their Google+ credentials.
- This allows you to know who they are on Google+ and to build a more personalized experience in
- your app. <a href="https://developers.google.com/+/mobile/android/sign-in"
- class="external-link">Add sign in</a>.</p>
+ <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>.</p>
- <h4>Share to Google+</h4>
- <p>Display a Share dialog that lets your users share rich content from your app,
- including text, photos, URL attachments, and location, into the Google+ stream.
- <a href="https://developers.google.com/+/mobile/android/share"
- class="external-link">Add sharing with Google+</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. When users +1, they
- can also share content with their circles. These endorsements can give your app more
- credibility and help it grow faster. <a class="external-link"
+ <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>.</p>
</div>
@@ -59,9 +65,13 @@
</p>
<h4>2. Run the sample</h4>
- <p>Once you've installed the Google Play services package, the Google+ sample is located in
- <code><android-sdk>/extras/google-play-services/samples/plus</code> and shows you
- how to use the major components of the Google+ Android APIs.
+ <p>Once you've installed the Google Play services package, you can run the Google+ sample located in
+ <code><android-sdk>/extras/google-play-services/samples/plus</code>. However, before
+ you can run the sample, you need to register your app in the Google APIs Console.</p>
+ <p>See <a class="external-link"
+ href="https://developers.google.com/+/mobile/android/getting-started">Getting Started with
+ the Google+ Platform for Android</a> for more information about how to get the sample up and
+ running.
</p>
<h4>3. Read the documentation</h4>
diff --git a/docs/html/images/google/gps-googleplus.png b/docs/html/images/google/gps-googleplus.png
index b7a51ec..99030c0 100644
--- a/docs/html/images/google/gps-googleplus.png
+++ b/docs/html/images/google/gps-googleplus.png
Binary files differ
diff --git a/docs/html/images/google/gps-plus-signin-hero.jpg b/docs/html/images/google/gps-plus-signin-hero.jpg
new file mode 100644
index 0000000..d84586f
--- /dev/null
+++ b/docs/html/images/google/gps-plus-signin-hero.jpg
Binary files differ
diff --git a/docs/html/images/google/plus-logo.png b/docs/html/images/google/plus-logo.png
new file mode 100644
index 0000000..5706258
--- /dev/null
+++ b/docs/html/images/google/plus-logo.png
Binary files differ
