diff --git a/docs/html/google/index.jd b/docs/html/google/index.jd index 49eac1cfa906e..1c83e7815e019 100644 --- a/docs/html/google/index.jd +++ b/docs/html/google/index.jd @@ -30,7 +30,7 @@ track app usage, and enhance your app with features such as maps, sign-in, and cloud messaging.

Although these Google services are not included in the Android platform, they are supported by most Android-powered devices. When using these services, you can - distribute your app to all device with Google Play running Android 2.2 + distribute your app on Google Play to all devices running Android 2.2 or higher, and some services support even more devices.

diff --git a/docs/html/google/play-services/setup.jd b/docs/html/google/play-services/setup.jd index ec5d26f37c217..2994c2c74b0af 100644 --- a/docs/html/google/play-services/setup.jd +++ b/docs/html/google/play-services/setup.jd @@ -8,34 +8,55 @@ page.title=Setup Manager. The download includes the client library and code samples.

-

- To set up the Google Play services SDK: -

+

You must download the Google Play services SDK in order to develop using the +Google Play services APIs. However, you +cannot use the Android emulator to test an app that depends on the Google Play services +APIs—you must use a real device running Android 2.2 or higher that includes +Google Play Store.

+ + +

To install the Google Play services SDK for development:

    -
  1. - Launch Eclipse and select Window > Android SDK Manager or run android - at the command line. -
    2. -
  2. - Scroll to the bottom of the package list and select Extras > Google Play services. - The Google Play services SDK is downloaded to your computer and installed in your Android SDK environment at - <android-sdk-folder>/extras/google/google_play_services/. -
    3. -
  3. Copy the <android-sdk-folder>/extras/google/google_play_services/libproject/google-play-services_lib - library project to a location in your project's source tree. -

    If you are using Eclipse, import the library project into your workspace. Click File > Import..., select Android > Existing - Android Code into Workspace, and browse to the copy of the library project to import it.

    -
    4. -
  4. Reference the library project in your Android project. -

    See the - Referencing a Library Project for Eclipse - or Referencing a Library Project on the Command Line - for more information on how to do this.

    -
    5. -
  5. If you are using ProGuard, add the following - lines in the <project_directory>/proguard-project.txt file - to prevent ProGuard from stripping away required classes: +
  6. Launch the SDK Manager. + +
    7. +
  7. + Scroll to the bottom of the package list, select Extras > Google Play services, + and install it. +

    The Google Play services SDK is saved in your Android SDK environment at + <android-sdk-folder>/extras/google/google_play_services/.

    +
    8. +
  8. Copy the <android-sdk-folder>/extras/google/google_play_services/libproject/google-play-services_lib + library project into the source tree where you maintain your Android app projects. +

    If you are using Eclipse, import the library project into your workspace. Click File > Import, select Android > Existing + Android Code into Workspace, and browse to the copy of the library project to import it.

    +
    9. +
+ + +

To set up a project to use the Google Play services SDK:

+ +
    +
  1. Reference the library project in your Android project. +

    See the + Referencing a Library Project for Eclipse + or Referencing a Library Project on the Command Line + for more information on how to do this.

    +

    Note: + You should be referencing a copy of the library that you copied to your + source tree—you should not reference the library from the Android SDK directory.

    +
    2. +
  2. If you are using ProGuard, add the following + lines in the <project_directory>/proguard-project.txt file + to prevent ProGuard from stripping away required classes: 
     -keep class * extends java.util.ListResourceBundle {
     protected Object[][] getContents();