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

Commit fd836c29 authored Jun 25, 2015 by Narayan Kamath Committed by Android Git Automerger Jun 25, 2015

am c279a835: am 37c68894: am a78c0e0b: Merge "Fixed Javadoc typos"

* commit 'c279a835':
  Fixed Javadoc typos

parents 3c70893a c279a835

core/java/android/view/View.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -19022,7 +19022,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>

core/java/android/webkit/WebViewClient.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -415,7 +415,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
		*/

media/java/android/media/MediaPlayer.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -793,7 +793,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