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

Commit 1398102c authored by Scott Main's avatar Scott Main Committed by Android Git Automerger
Browse files

am bd24f5cc: am 53b0fda5: misc doc bugs. Fix sdk samples path Fix method... 

am bd24f5cc: am 53b0fda5: misc doc bugs. Fix sdk samples path Fix method signature in fragment doc code snippet Fix typo in a11y javadoc  code snippet Fix markup error in brands page Fix markup error on content providers doc Fix typo on about>start page

* commit 'bd24f5cc':
  misc doc bugs. Fix sdk samples path Fix method signature in fragment doc code snippet Fix typo in a11y javadoc  code snippet Fix markup error in brands page Fix markup error on content providers doc Fix typo on about>start page
parents 153dd4cd bd24f5cc

core/java/android/accessibilityservice/AccessibilityService.java

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ import com.android.internal.os.HandlerCaller; 
 * accessibility service. Following is an example declaration:

 * </p>

 * <pre> &lt;service android:name=".MyAccessibilityService"

 *         android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE&gt;

 *         android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE"&gt;

 *     &lt;intent-filter&gt;

 *         &lt;action android:name="android.accessibilityservice.AccessibilityService" /&gt;

 *     &lt;/intent-filter&gt;

docs/html/about/start.jd

+2 −2
Original line number Diff line number Diff line
@@ -29,9 +29,9 @@ h2.green+hr{background:#99CC00} 
<p>Before you write a single line of code, you need to design the user interface and make it fit

the Android user experience. Although you may know what a user will <em>do</em> with your app, you

should pause to focus on how a user will <em>interact</em> with it. Your design should be sleek,

simple, powereful, and tailored to the Android experience.</p>

simple, powerful, and tailored to the Android experience.</p>



<p>So whether your a one-man shop or a large team, you should study the <a

<p>So whether you're a one-man shop or a large team, you should study the <a

href="{@docRoot}design/index.html">Design</a> guidelines first.</p>

</div>

docs/html/distribute/googleplay/promote/brand.jd

+2 −2
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ any way you want, provided that you follow the guidelines described below.</p> 
                <span style="margin-left:1em;">http://play.google.com/store/search?q=<em>yourCompanyName</em></span>

                </li>

                <li>A list of products published by you, for example,<br />

                <span style="margin-left:1em;">http://play.google.com/store/search?q=<em>publisherName</em>M/span>

                <span style="margin-left:1em;">http://play.google.com/store/search?q=<em>publisherName</em></span>

                </li>

                <li>A specific app product details page within Google Play, for example,<br />

                <span style="margin-left:1em;">http://play.google.com/store/apps/details?id=<em>packageName</em></span>
@@ -171,4 +171,4 @@ any way you want, provided that you follow the guidelines described below.</p> 
<h2>Other Brands</h2>



<p>Any other brands or icons depicted on this site are <em>not</em> are the property of their

repective owners and usage is reserved. You must seek the developer for appropriate permission to use them.</p>
 
respective owners and usage is reserved. You must seek the developer for appropriate permission to use them.</p>

docs/html/guide/topics/providers/content-provider-basics.jd

+5 −5
Original line number Diff line number Diff line
@@ -1030,12 +1030,12 @@ mRowsDeleted = getContentResolver().delete( 
    A provider defines URI permissions for content URIs in its manifest, using the

    <code><a href="{@docRoot}guide/topics/manifest/provider-element.html#gprmsn">

    android:grantUriPermission</a></code>

    attribute of the

    {@code <a href="{@docRoot}guide/topics/manifest/provider-element.html">&lt;provider&gt;</a>}

    attribute of the <a href="{@docRoot}guide/topics/manifest/provider-element.html">

    {@code &lt;provider&gt;}</a>

    element, as well as the

    {@code <a href="{@docRoot}guide/topics/manifest/grant-uri-permission-element.html">

    &lt;grant-uri-permission&gt;</a>} child element of the

    {@code <a href="{@docRoot}guide/topics/manifest/provider-element.html">&lt;provider&gt;</a>}

    <a href="{@docRoot}guide/topics/manifest/grant-uri-permission-element.html">{@code 

    &lt;grant-uri-permission&gt;}</a> child element of the

    <a href="{@docRoot}guide/topics/manifest/provider-element.html">{@code &lt;provider&gt;}</a>

    element. The URI permissions mechanism is explained in more detail in the

    <a href="{@docRoot}guide/topics/security/security.html">Security and Permissions</a> guide,

    in the section "URI Permissions".

docs/html/tools/samples/index.jd

+8 −7
Original line number Diff line number Diff line
@@ -3,7 +3,8 @@ page.title=Samples 
@jd:body



<p>To help you understand some fundamental Android APIs and coding practices, a variety of sample

code is available from the Android SDK Manager.</p>

code is available from the Android SDK Manager. Each version of the Android platform available

from the SDK Manager offers its own set of sample apps.</p>



<p>To download the samples:</p>

<ol>
@@ -18,14 +19,14 @@ Android SDK, then execute {@code android sdk}.</ul> 
  <li>Select and download <em>Samples for SDK</em>.</li>

</ol>



<p>When the download is complete, you can find the samples sources at this location:</p>

<p>When the download is complete, you can find the source code for all samples at this location:</p>



<p style="margin-left:2em">

<code><em>&lt;sdk&gt;</em>/platforms/&lt;android-version>/samples/</code>

<code>&lt;sdk&gt;/samples/android-&lt;version>/</code>

</p>



<p>The {@code &lt;version>} number corresponds to the platform's

  <a href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#ApiLevels">API level</a>.</p>



<p>You can easily create new Android projects with the downloaded samples, modify them

if you'd like, and then run them on an emulator or device.</p>
 
 No newline at end of file
 
<!--

<p>Below are summaries for several of the available samples.</p>

-->
 
 No newline at end of file