diff options
| author | Scott Main <smain@google.com> | 2012-03-15 11:39:11 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-03-15 11:39:11 -0700 |
| commit | 5d85819cedae803e1240dc854c0733d30b8de968 (patch) | |
| tree | fdd197c4cd33c768d904e3d135c557371e6f039f /docs | |
| parent | b6d57d53937b850c6524a7871d8abb0ffca68307 (diff) | |
| parent | 40b4f04ac3f8dd11fc1313472aca3713b34d7f6a (diff) | |
| download | frameworks_base-5d85819cedae803e1240dc854c0733d30b8de968.zip frameworks_base-5d85819cedae803e1240dc854c0733d30b8de968.tar.gz frameworks_base-5d85819cedae803e1240dc854c0733d30b8de968.tar.bz2 | |
am 40b4f04a: am 15010776: am f32ab914: Merge "docs: update various SDK and AVD Manager screenshots and remove one from the licensing doc that\'s not necessary" into ics-mr1
* commit '40b4f04ac3f8dd11fc1313472aca3713b34d7f6a':
docs: update various SDK and AVD Manager screenshots and remove one from the licensing doc that's not necessary
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/html/guide/market/licensing/setting-up.jd | 18 | ||||
| -rw-r--r-- | docs/html/images/avd-manager.png | bin | 35192 -> 52605 bytes | |||
| -rw-r--r-- | docs/html/images/billing_package.png | bin | 44231 -> 96932 bytes | |||
| -rw-r--r-- | docs/html/images/developing/avd-dialog.png | bin | 47189 -> 45902 bytes | |||
| -rw-r--r-- | docs/html/images/developing/sdk-usb-driver.png | bin | 120183 -> 95652 bytes | |||
| -rw-r--r-- | docs/html/images/licensing_add_library.png | bin | 44097 -> 76259 bytes | |||
| -rw-r--r-- | docs/html/images/licensing_gapis_8.png | bin | 46457 -> 0 bytes | |||
| -rw-r--r-- | docs/html/images/licensing_package.png | bin | 44177 -> 96793 bytes | |||
| -rw-r--r-- | docs/html/images/sdk_manager_packages.png | bin | 115486 -> 98105 bytes | |||
| -rw-r--r-- | docs/html/sdk/win-usb.jd | 2 |
10 files changed, 7 insertions, 13 deletions
diff --git a/docs/html/guide/market/licensing/setting-up.jd b/docs/html/guide/market/licensing/setting-up.jd index 15214d1..41e3bc4 100644 --- a/docs/html/guide/market/licensing/setting-up.jd +++ b/docs/html/guide/market/licensing/setting-up.jd @@ -177,12 +177,6 @@ href="#acct-signin">Signing in to an authorized account</a>, below.</p></li> <strong>Google APIs Add-On, API 8 (release 2) or higher</strong> includes the necessary Google Play services.</p> - -<img src="{@docRoot}images/licensing_gapis_8.png" alt=""/> -<p class="img-caption"><strong>Figure 2.</strong> Google APIs -Add-On, API 8 (release 2) or higher lets you debug and test your licensing -implementation in an emulator.</p> - <p>To set up an emulator for adding licensing to an application, follow these steps: </p> @@ -190,7 +184,7 @@ these steps: </p> <li>Launch the Android SDK Manager. </li> <li>In the <strong>Available Packages</strong> panel, select and download the SDK component "Google APIs (Google Inc.) - API Level 8" (or higher) from the SDK -repository, as shown in figure 2. +repository. <p>When the download is complete, use the Android SDK Manager to create a new AVD based on that component, described next.</p></li> <li>In the <strong>Virtual @@ -256,11 +250,11 @@ classes to check and enforce licensing.</li> <p>To download the LVL component into your development environment, use the Android SDK Manager. Launch the Android SDK Manager and then -select the "Google Market Licensing" component, as shown in figure 3. +select the "Google Market Licensing" component, as shown in figure 2. Accept the terms and click <strong>Install Selected</strong> to begin the download. </p> <img src="{@docRoot}images/licensing_package.png" alt=""/> -<p class="img-caption"><strong>Figure 3.</strong> The Licensing package contains the LVL and +<p class="img-caption"><strong>Figure 2.</strong> The Licensing package contains the LVL and the LVL sample application.</p> <p>When the download is complete, the Android SDK Manager installs both @@ -390,7 +384,7 @@ Managing Projects from Eclipse with ADT</a></p>. <img src="{@docRoot}images/licensing_add_library.png" alt=""/> -<p class="img-caption"><strong>Figure 4.</strong> If you are +<p class="img-caption"><strong>Figure 3.</strong> If you are working in Eclipse with ADT, you can add the LVL library project to your application from the application's project properties.</p> @@ -494,7 +488,7 @@ Response Codes</a> in the <a href="{@docRoot}guide/market/licensing/licensing-reference.html">Licensing Reference</a>.</p> <img src="{@docRoot}images/licensing_test_response.png" alt=""/> -<p class="img-caption"><strong>Figure 5.</strong> The Licensing +<p class="img-caption"><strong>Figure 4.</strong> The Licensing panel of your account's Edit Profile page, showing the Test Accounts field and the Test Response menu.</p> @@ -586,7 +580,7 @@ Differences in account types for testing licensing.</p> <h4 id="reg-test-acct">Registering test accounts on the publisher account</h4> <p>To get started, you need to register each test account in your publisher -account. As shown in Figure 5, you +account. As shown in Figure 4, you register test accounts in the Licensing panel of your publisher account's Edit Profile page. Simply enter the accounts as a comma-delimited list and click <strong>Save</strong> to save your profile changes.</p> diff --git a/docs/html/images/avd-manager.png b/docs/html/images/avd-manager.png Binary files differindex c33d8a8..fd373f9 100644 --- a/docs/html/images/avd-manager.png +++ b/docs/html/images/avd-manager.png diff --git a/docs/html/images/billing_package.png b/docs/html/images/billing_package.png Binary files differindex 951e117..6e673c8 100644 --- a/docs/html/images/billing_package.png +++ b/docs/html/images/billing_package.png diff --git a/docs/html/images/developing/avd-dialog.png b/docs/html/images/developing/avd-dialog.png Binary files differindex d0e2eec..9dfbd68 100644 --- a/docs/html/images/developing/avd-dialog.png +++ b/docs/html/images/developing/avd-dialog.png diff --git a/docs/html/images/developing/sdk-usb-driver.png b/docs/html/images/developing/sdk-usb-driver.png Binary files differindex 207d3d7..3489991 100644 --- a/docs/html/images/developing/sdk-usb-driver.png +++ b/docs/html/images/developing/sdk-usb-driver.png diff --git a/docs/html/images/licensing_add_library.png b/docs/html/images/licensing_add_library.png Binary files differindex 3bbe6d5..257a628 100644 --- a/docs/html/images/licensing_add_library.png +++ b/docs/html/images/licensing_add_library.png diff --git a/docs/html/images/licensing_gapis_8.png b/docs/html/images/licensing_gapis_8.png Binary files differdeleted file mode 100644 index 480d989..0000000 --- a/docs/html/images/licensing_gapis_8.png +++ /dev/null diff --git a/docs/html/images/licensing_package.png b/docs/html/images/licensing_package.png Binary files differindex eb2c5cf..dc34473 100644 --- a/docs/html/images/licensing_package.png +++ b/docs/html/images/licensing_package.png diff --git a/docs/html/images/sdk_manager_packages.png b/docs/html/images/sdk_manager_packages.png Binary files differindex 19a7cb9..a0e8108 100644 --- a/docs/html/images/sdk_manager_packages.png +++ b/docs/html/images/sdk_manager_packages.png diff --git a/docs/html/sdk/win-usb.jd b/docs/html/sdk/win-usb.jd index 2bd031e..6869d74 100644 --- a/docs/html/sdk/win-usb.jd +++ b/docs/html/sdk/win-usb.jd @@ -147,7 +147,7 @@ for the T-Mobile G1 and myTouch 3G (and similar devices).</p></dt> <h2 id="WinUsbDriver">Downloading the Google USB Driver</h2> -<div class="figure" style="width:498px;margin:0"> +<div class="figure" style="width:536px;margin:0"> <img src="{@docRoot}images/developing/sdk-usb-driver.png" alt="" /> <p class="img-caption"><strong>Figure 1.</strong> The SDK and AVD Manager with the Google USB Driver selected.</p> |
