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

Commit e3f55d45 authored by Ben Dodson's avatar Ben Dodson Committed by Android (Google) Code Review
Browse files

Merge "Updated documentation for upcoming fix for @code tags"

parents 8ed880d7 4e8620f8

core/java/android/net/Uri.java

+4 −4
Original line number Diff line number Diff line
@@ -1253,14 +1253,14 @@ public abstract class Uri implements Parcelable, Comparable<Uri> { 
     * concurrent use.

     *

     * <p>An absolute hierarchical URI reference follows the pattern:

     * {@code &lt;scheme&gt;://&lt;authority&gt;&lt;absolute path&gt;?&lt;query&gt;#&lt;fragment&gt;}

     * {@code <scheme>://<authority><absolute path>?<query>#<fragment>}

     *

     * <p>Relative URI references (which are always hierarchical) follow one

     * of two patterns: {@code &lt;relative or absolute path&gt;?&lt;query&gt;#&lt;fragment&gt;}

     * or {@code //&lt;authority&gt;&lt;absolute path&gt;?&lt;query&gt;#&lt;fragment&gt;}

     * of two patterns: {@code <relative or absolute path>?<query>#<fragment>}

     * or {@code //<authority><absolute path>?<query>#<fragment>}

     *

     * <p>An opaque URI follows this pattern:

     * {@code &lt;scheme&gt;:&lt;opaque part&gt;#&lt;fragment&gt;}

     * {@code <scheme>:<opaque part>#<fragment>}

     */

    public static final class Builder {

core/java/android/speech/SpeechRecognizer.java

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ public class SpeechRecognizer { 
    private static final String TAG = "SpeechRecognizer";



    /**

     * Used to retrieve an {@code ArrayList&lt;String&gt;} from the {@link Bundle} passed to the

     * Used to retrieve an {@code ArrayList<String>} from the {@link Bundle} passed to the

     * {@link RecognitionListener#onResults(Bundle)} and

     * {@link RecognitionListener#onPartialResults(Bundle)} methods. These strings are the possible

     * recognition results, where the first element is the most likely candidate.

core/java/android/webkit/WebView.java

+3 −3
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ import java.util.Set; 
 * <pre>&lt;uses-permission android:name="android.permission.INTERNET" /></pre>

 *

 * <p>This must be a child of the <a

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

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

 * element.</p>

 *

 * <p>See the <a href="{@docRoot}resources/tutorials/views/hello-webview.html">Web View
@@ -140,7 +140,7 @@ import java.util.Set; 
 * </pre>

 * <p>See {@link android.content.Intent} for more information.</p>

 *

 * <p>To provide a WebView in your own Activity, include a {@code &lt;WebView&gt;} in your layout,

 * <p>To provide a WebView in your own Activity, include a {@code <WebView>} in your layout,

 * or set the entire Activity window as a WebView during {@link

 * android.app.Activity#onCreate(Bundle) onCreate()}:</p>

 * <pre class="prettyprint">
@@ -287,7 +287,7 @@ import java.util.Set; 
 * low density screens scale down. This is also the default behavior.</li>

 * <li>{@code low-dpi} - Use ldpi as the target dpi. Medium and high density screens scale up

 * as appropriate.</li>

 * <li><em>{@code &lt;value&gt;}</em> - Specify a dpi value to use as the target dpi (accepted

 * <li><em>{@code <value>}</em> - Specify a dpi value to use as the target dpi (accepted

 * values are 70-400).</li>

 * </ul>

 * <p>Here's an example meta tag to specify the target density:</p>

core/java/android/widget/ImageButton.java

+2 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ import java.util.Map; 
 * {@link android.widget.Button}, with the standard button background

 * that changes color during different button states. The image on the surface

 * of the button is defined either by the {@code android:src} attribute in the

 * {@code &lt;ImageButton&gt;} XML element or by the 

 * {@code <ImageButton>} XML element or by the

 * {@link #setImageResource(int)} method.</p>

 * 

 * <p>To remove the standard button background image, define your own
@@ -57,7 +57,7 @@ import java.util.Map; 
 * based on the state of the button and the corresponding images

 * defined in the XML.</p>

 *

 * <p>The order of the {@code &lt;item>} elements is important because they are

 * <p>The order of the {@code <item>} elements is important because they are

 * evaluated in order. This is why the "normal" button image comes last, because

 * it will only be applied after {@code android:state_pressed} and {@code

 * android:state_focused} have both evaluated false.</p>

core/java/com/android/internal/util/TypedProperties.java

+1 −1
Original line number Diff line number Diff line
@@ -412,7 +412,7 @@ public class TypedProperties extends HashMap<String, Object> { 
     */



    /**

     * An unchecked exception that is thrown if a {@code get&lt;TYPE&gt;()} method

     * An unchecked exception that is thrown if a {@code get<TYPE>()} method

     * is used to retrieve a parameter whose type does not match the method name.

     */

    public static class TypeException extends IllegalArgumentException {