Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 698b2e81 authored by Scott Main's avatar Scott Main Committed by Android Git Automerger
Browse files

am 4143781c: docs: add docs for market OBB includes splitting the Licensing... 

am 4143781c: docs: add docs for market OBB includes splitting the Licensing dev guide into multiple pages; Turned original licensing doc into a redirect to the new files that are under guide/market/licensing/; Fix all links pointing to app licensing

* commit '4143781c':
  docs: add docs for market OBB includes splitting the Licensing dev guide into multiple pages; Turned original licensing doc into a redirect to the new files that are under guide/market/licensing/; Fix all links pointing to app licensing
parents 5d7bd799 4143781c

docs/html/guide/appendix/install-location.jd

+1 −1
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ external storage, it can never receive this broadcast.</dd> 
  <dt>Copy Protection</dt>

    <dd>Your application cannot be installed to a device's SD card if it uses Android Market's 

      Copy Protection feature. However, if you use Android Market's 

      <a href="{@docRoot}guide/publishing/licensing.html">Application Licensing</a> instead, your 

      <a href="{@docRoot}guide/market/licensing/index.html">Application Licensing</a> instead, your 

      application <em>can</em> be installed to internal or external storage, including SD cards.</dd>

</dl>

docs/html/guide/developing/tools/proguard.jd

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ parent.link=index.html 
  sized <code>.apk</code> file that is more difficult to reverse engineer. Because ProGuard makes your

  application harder to reverse engineer, it is important that you use it

  when your application utilizes features that are sensitive to security like when you are

  <a href="{@docRoot}guide/publishing/licensing.html">Licensing Your Applications</a>.</p>

  <a href="{@docRoot}guide/market/licensing/index.html">Licensing Your Applications</a>.</p>



  <p>ProGuard is integrated into the Android build system, so you do not have to invoke it

  manually. ProGuard runs only when you build your application in release mode, so you do not

docs/html/guide/guide_toc.cs

+21 −1
Original line number Diff line number Diff line
@@ -451,8 +451,24 @@ 
      <li><a href="<?cs var:toroot ?>guide/publishing/publishing.html">

          <span class="en">Publishing on Android Market</span>

          </a></li>

      <li><a href="<?cs var:toroot ?>guide/publishing/licensing.html">

      <li class="toggle-list">

        <div><a href="<?cs var:toroot ?>guide/market/licensing/index.html">

          <span class="en">Application Licensing</span></a>

        </div>

        <ul>

          <li><a href="<?cs var:toroot?>guide/market/licensing/overview.html">

              <span class="en">Licensing Overview</span></a>

          </li>

          <li><a href="<?cs var:toroot?>guide/market/licensing/setting-up.html">

              <span class="en">Setting Up for Licensing</span></a>

          </li>

          <li><a href="<?cs var:toroot?>guide/market/licensing/adding-licensing.html">

              <span class="en">Adding Licensing to Your App</span></a>

          </li>

          <li><a href="<?cs var:toroot?>guide/market/licensing/licensing-reference.html">

              <span class="en">Licensing Reference</span></a>

          </li>

        </ul>

      </li>

      <li class="toggle-list">

        <div><a href="<?cs var:toroot?>guide/market/billing/index.html">
@@ -485,6 +501,10 @@ 
      <li><a href="<?cs var:toroot ?>guide/market/publishing/multiple-apks.html">

          <span class="en">Multiple APK Support</span></a>

      </li>

      <li><a href="<?cs var:toroot ?>guide/market/expansion-files.html">

          <span class="en">APK Expansion Files</span></a>

          <span class="new">new!</span>

      </li>

    </ul>

  </li>