diff options
| author | 2015-06-25 08:27:47 +0000 | |
|---|---|---|
| committer | 2015-06-25 08:27:47 +0000 | |
| commit | a78c0e0b9aff70d03101a25b47024f6d02cb93e2 (patch) | |
| tree | 17dff33fa5d3ba59df689d494ff52ea65171a8b3 | |
| parent | 08592bd0f7daf5c1d10baf78d5e216befd7b6a8e (diff) | |
| parent | 802aa0f8a22524d8b338d8279c1e121f21b9cdc2 (diff) | |
Merge "Fixed Javadoc typos"
| -rw-r--r-- | core/java/android/view/View.java | 2 | ||||
| -rw-r--r-- | core/java/android/webkit/WebViewClient.java | 2 | ||||
| -rw-r--r-- | media/java/android/media/MediaPlayer.java | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index 3c058729880a..9176d9e5d84e 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -17765,7 +17765,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, /** * Returns the suggested minimum width that the view should use. This - * returns the maximum of the view's minimum width) + * returns the maximum of the view's minimum width * and the background's minimum width * ({@link android.graphics.drawable.Drawable#getMinimumWidth()}). * <p> diff --git a/core/java/android/webkit/WebViewClient.java b/core/java/android/webkit/WebViewClient.java index d52dd60e00f0..0a6bba829122 100644 --- a/core/java/android/webkit/WebViewClient.java +++ b/core/java/android/webkit/WebViewClient.java @@ -338,7 +338,7 @@ public class WebViewClient { * Notify the host application that the scale applied to the WebView has * changed. * - * @param view he WebView that is initiating the callback. + * @param view The WebView that is initiating the callback. * @param oldScale The old scale factor * @param newScale The new scale factor */ diff --git a/media/java/android/media/MediaPlayer.java b/media/java/android/media/MediaPlayer.java index 615dac204f7b..ccfa7ed1a3ee 100644 --- a/media/java/android/media/MediaPlayer.java +++ b/media/java/android/media/MediaPlayer.java @@ -777,7 +777,7 @@ public class MediaPlayer implements SubtitleController.Listener * <li> {@link #VIDEO_SCALING_MODE_SCALE_TO_FIT_WITH_CROPPING} * </ul> * - * @param mode target video scaling mode. Most be one of the supported + * @param mode target video scaling mode. Must be one of the supported * video scaling modes; otherwise, IllegalArgumentException will be thrown. * * @see MediaPlayer#VIDEO_SCALING_MODE_SCALE_TO_FIT |