Snap for 5991964 from bcc7d237a6cb7ff7640d6d7847cec5b2d5e46942 to qt-qpr2-release (7c3fe768) · Commits · e / os / android_frameworks_base

core/java/android/content/SyncStats.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -58,7 +58,7 @@ public class SyncStats implements Parcelable {
		* attempted to update or delete a version of a resource on the server. This is expected
		* to clear itself automatically once the new state is retrieved from the server,
		* though it may remain until the user intervenes manually, perhaps by clearing the
		* local storage and starting over frmo scratch. This is considered a hard error.
		* local storage and starting over from scratch. This is considered a hard error.
		*/
		public long numConflictDetectedExceptions;

core/java/android/net/nsd/NsdManager.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -49,8 +49,8 @@ import java.util.concurrent.CountDownLatch;
		* limited to a local network over Multicast DNS. DNS service discovery is described at
		* http://files.dns-sd.org/draft-cheshire-dnsext-dns-sd.txt
		*
		* <p> The API is asynchronous and responses to requests from an application are on listener
		* callbacks on a seperate internal thread.
		* <p> The API is asynchronous, and responses to requests from an application are on listener
		* callbacks on a separate internal thread.
		*
		* <p> There are three main operations the API supports - registration, discovery and resolution.
		* <pre>

core/java/android/view/View.java

+6 −6

Original line number	Diff line number	Diff line
		@@ -492,7 +492,7 @@ import java.util.function.Predicate;
		*
		* <p>
		* To initiate a layout, call {@link #requestLayout}. This method is typically
		* called by a view on itself when it believes that is can no longer fit within
		* called by a view on itself when it believes that it can no longer fit within
		* its current bounds.
		* </p>
		*
		@@ -2850,7 +2850,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,

		/**
		* Default for the root view. The gravity determines the text alignment, ALIGN_NORMAL,
		* ALIGN_CENTER, or ALIGN_OPPOSITE, which are relative to each paragraph’s text direction.
		* ALIGN_CENTER, or ALIGN_OPPOSITE, which are relative to each paragraph's text direction.
		*
		* Use with {@link #setTextAlignment(int)}
		*/
		@@ -2878,7 +2878,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		public static final int TEXT_ALIGNMENT_CENTER = 4;

		/**
		* Align to the start of the view, which is ALIGN_LEFT if the view’s resolved
		* Align to the start of the view, which is ALIGN_LEFT if the view's resolved
		* layoutDirection is LTR, and ALIGN_RIGHT otherwise.
		*
		* Use with {@link #setTextAlignment(int)}
		@@ -2886,7 +2886,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		public static final int TEXT_ALIGNMENT_VIEW_START = 5;

		/**
		* Align to the end of the view, which is ALIGN_RIGHT if the view’s resolved
		* Align to the end of the view, which is ALIGN_RIGHT if the view's resolved
		* layoutDirection is LTR, and ALIGN_LEFT otherwise.
		*
		* Use with {@link #setTextAlignment(int)}
		@@ -3689,7 +3689,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		* if the user swipes from the top of the screen.
		* <p>When system bars are hidden in immersive mode, they can be revealed temporarily with
		* system gestures, such as swiping from the top of the screen. These transient system bars
		* will overlay app’s content, may have some degree of transparency, and will automatically
		* will overlay app's content, may have some degree of transparency, and will automatically
		* hide after a short timeout.
		* </p><p>Since this flag is a modifier for {@link #SYSTEM_UI_FLAG_FULLSCREEN} and
		* {@link #SYSTEM_UI_FLAG_HIDE_NAVIGATION}, it only has an effect when used in combination
		@@ -10293,7 +10293,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		}

		/**
		* Gets the unique identifier of the window in which this View reseides.
		* Gets the unique identifier of the window in which this View resides.
		*
		* @return The window accessibility id.
		*

core/java/android/view/animation/AnimationUtils.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -127,7 +127,7 @@ public class AnimationUtils {
		*
		* @param context Application context used to access resources
		* @param id The resource id of the animation to load
		* @return The animation object reference by the specified id
		* @return The animation object referenced by the specified id
		* @throws NotFoundException when the animation cannot be loaded
		*/
		public static Animation loadAnimation(Context context, @AnimRes int id)
		@@ -208,7 +208,7 @@ public class AnimationUtils {
		*
		* @param context Application context used to access resources
		* @param id The resource id of the animation to load
		* @return The animation object reference by the specified id
		* @return The animation controller object referenced by the specified id
		* @throws NotFoundException when the layout animation controller cannot be loaded
		*/
		public static LayoutAnimationController loadLayoutAnimation(Context context, @AnimRes int id)
		@@ -331,7 +331,7 @@ public class AnimationUtils {
		*
		* @param context Application context used to access resources
		* @param id The resource id of the animation to load
		* @return The animation object reference by the specified id
		* @return The interpolator object referenced by the specified id
		* @throws NotFoundException
		*/
		public static Interpolator loadInterpolator(Context context, @AnimRes @InterpolatorRes int id)
		@@ -361,7 +361,7 @@ public class AnimationUtils {
		*
		* @param res The resources
		* @param id The resource id of the animation to load
		* @return The interpolator object reference by the specified id
		* @return The interpolator object referenced by the specified id
		* @throws NotFoundException
		* @hide
		*/

core/java/android/webkit/WebSettings.java

+6 −1

Original line number	Diff line number	Diff line
		@@ -328,6 +328,9 @@ public abstract class WebSettings {
		* <p>
		* The built-in mechanisms are the only currently supported zoom
		* mechanisms, so it is recommended that this setting is always enabled.
		* However, on-screen zoom controls are deprecated in Android (see
		* {@link android.widget.ZoomButtonsController}) so it's recommended to
		* disable {@link #setDisplayZoomControls}.
		*
		* @param enabled whether the WebView should use its built-in zoom mechanisms
		*/
		@@ -347,7 +350,9 @@ public abstract class WebSettings {
		/**
		* Sets whether the WebView should display on-screen zoom controls when
		* using the built-in zoom mechanisms. See {@link #setBuiltInZoomControls}.
		* The default is {@code true}.
		* The default is {@code true}. However, on-screen zoom controls are deprecated
		* in Android (see {@link android.widget.ZoomButtonsController}) so it's
		* recommended to set this to {@code false}.
		*
		* @param enabled whether the WebView should display on-screen zoom controls
		*/