diff --git a/docs/html/google/play-services/setup.jd b/docs/html/google/play-services/setup.jd index 6553c1840f909..fb656b7481159 100644 --- a/docs/html/google/play-services/setup.jd +++ b/docs/html/google/play-services/setup.jd @@ -1,6 +1,24 @@ page.title=Set Up Google Play Services SDK @jd:body + + +
+
+ +

In this document

+
    +
  1. Install the Google Play Services SDK
  2. +
  3. Set Up a Project that Uses Google Play Services
  4. +
  5. Create a Proguard Exception
  6. +
  7. Ensure Devices Have the Google Play services APK
  8. +
+ + +
+
+ +

To develop an app using the Google Play services APIs, you must download the Google Play services SDK @@ -10,7 +28,7 @@ The download includes the client library and code samples.

To test your app when using the Google Play services SDK, you must use either:

@@ -24,9 +42,12 @@ both phones and tablets.

To install the Google Play services SDK for development:

    -
  1. Launch the SDK Manager. +
  2. Launch the SDK Manager in one of the following ways:
-

Once you have the Google Play services library project added to your app project, -you can begin developing features with the -Google Play services APIs.

@@ -191,4 +256,4 @@ a user's device:

to display an error message to the user, which allows the user to download the APK from the Google Play Store or enable it in the device's system settings. - \ No newline at end of file + diff --git a/docs/html/images/tools/sync-project.png b/docs/html/images/tools/sync-project.png new file mode 100644 index 0000000000000..09e1835642083 Binary files /dev/null and b/docs/html/images/tools/sync-project.png differ diff --git a/docs/html/tools/help/proguard.jd b/docs/html/tools/help/proguard.jd index be0b8dc2b6a12..3ba7db2718650 100644 --- a/docs/html/tools/help/proguard.jd +++ b/docs/html/tools/help/proguard.jd @@ -61,6 +61,12 @@ parent.link=index.html

To enable ProGuard so that it runs as part of an Ant or Eclipse build, set the proguard.config property in the <project_root>/project.properties file. The path can be an absolute path or a path relative to the project's root.

+ +

Note: When using Android Studio, you must add Proguard +to your gradle.build file's build types. For more information, see the +Gradle Plugin User Guide. +

If you left the proguard.cfg file in its default location (the project's root directory), you can specify its location like this: