Snap for 5998981 from ed1acb11b9aea31073a3cc58829b8599fb2cae98 to qt-qpr2-release (22213f2e) · Commits · e / os / android_frameworks_base

core/java/android/animation/FloatEvaluator.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -24,7 +24,7 @@ public class FloatEvaluator implements TypeEvaluator<Number> {
		/**
		* This function returns the result of linearly interpolating the start and end values, with
		* <code>fraction</code> representing the proportion between the start and end values. The
		* calculation is a simple parametric calculation: <code>result = x0 + t * (v1 - v0)</code>,
		* calculation is a simple parametric calculation: <code>result = x0 + t * (x1 - x0)</code>,
		* where <code>x0</code> is <code>startValue</code>, <code>x1</code> is <code>endValue</code>,
		* and <code>t</code> is <code>fraction</code>.
		*

core/java/android/content/res/TypedArray.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -360,8 +360,9 @@ public class TypedArray {
		/**
		* Retrieve the boolean value for the attribute at <var>index</var>.
		* <p>
		* If the attribute is an integer value, this method will return whether
		* it is equal to zero. If the attribute is not a boolean or integer value,
		* If the attribute is an integer value, this method returns false if the
		* attribute is equal to zero, and true otherwise.
		* If the attribute is not a boolean or integer value,
		* this method will attempt to coerce it to an integer using
		* {@link Integer#decode(String)} and return whether it is equal to zero.
		*

core/java/android/os/UserManager.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -2370,6 +2370,8 @@ public class UserManager {

		/**
		* Return the number of users currently created on the device.
		* <p>This API is not for use by third-party apps. It requires the {@code MANAGE_USERS}
		* permission.</p>
		*/
		public int getUserCount() {
		List<UserInfo> users = getUsers();

core/java/android/service/notification/NotificationListenerService.java

+13 −2

Original line number	Diff line number	Diff line
		@@ -1514,6 +1514,7 @@ public abstract class NotificationListenerService extends Service {
		private ArrayList<Notification.Action> mSmartActions;
		private ArrayList<CharSequence> mSmartReplies;
		private boolean mCanBubble;
		private boolean mVisuallyInterruptive;

		private static final int PARCEL_VERSION = 2;

		@@ -1545,6 +1546,7 @@ public abstract class NotificationListenerService extends Service {
		out.writeTypedList(mSmartActions, flags);
		out.writeCharSequenceList(mSmartReplies);
		out.writeBoolean(mCanBubble);
		out.writeBoolean(mVisuallyInterruptive);
		}

		/** @hide */
		@@ -1577,6 +1579,7 @@ public abstract class NotificationListenerService extends Service {
		mSmartActions = in.createTypedArrayList(Notification.Action.CREATOR);
		mSmartReplies = in.readCharSequenceList();
		mCanBubble = in.readBoolean();
		mVisuallyInterruptive = in.readBoolean();
		}


		@@ -1763,6 +1766,11 @@ public abstract class NotificationListenerService extends Service {
		return mCanBubble;
		}

		/** @hide */
		public boolean visuallyInterruptive() {
		return mVisuallyInterruptive;
		}

		/** @hide */
		public boolean isNoisy() {
		return mNoisy;
		@@ -1779,7 +1787,8 @@ public abstract class NotificationListenerService extends Service {
		ArrayList<SnoozeCriterion> snoozeCriteria, boolean showBadge,
		int userSentiment, boolean hidden, long lastAudiblyAlertedMs,
		boolean noisy, ArrayList<Notification.Action> smartActions,
		ArrayList<CharSequence> smartReplies, boolean canBubble) {
		ArrayList<CharSequence> smartReplies, boolean canBubble,
		boolean visuallyInterruptive) {
		mKey = key;
		mRank = rank;
		mIsAmbient = importance < NotificationManager.IMPORTANCE_LOW;
		@@ -1800,6 +1809,7 @@ public abstract class NotificationListenerService extends Service {
		mSmartActions = smartActions;
		mSmartReplies = smartReplies;
		mCanBubble = canBubble;
		mVisuallyInterruptive = visuallyInterruptive;
		}

		/**
		@@ -1824,7 +1834,8 @@ public abstract class NotificationListenerService extends Service {
		other.mNoisy,
		other.mSmartActions,
		other.mSmartReplies,
		other.mCanBubble);
		other.mCanBubble,
		other.mVisuallyInterruptive);
		}

		/**

core/java/android/view/View.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -26391,7 +26391,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,

		/**
		* Returns the over-scroll mode for this view. The result will be
		* one of {@link #OVER_SCROLL_ALWAYS} (default), {@link #OVER_SCROLL_IF_CONTENT_SCROLLS}
		* one of {@link #OVER_SCROLL_ALWAYS}, {@link #OVER_SCROLL_IF_CONTENT_SCROLLS}
		* (allow over-scrolling only if the view content is larger than the container),
		* or {@link #OVER_SCROLL_NEVER}.
		*
		@@ -26408,7 +26408,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,

		/**
		* Set the over-scroll mode for this view. Valid over-scroll modes are
		* {@link #OVER_SCROLL_ALWAYS} (default), {@link #OVER_SCROLL_IF_CONTENT_SCROLLS}
		* {@link #OVER_SCROLL_ALWAYS}, {@link #OVER_SCROLL_IF_CONTENT_SCROLLS}
		* (allow over-scrolling only if the view content is larger than the container),
		* or {@link #OVER_SCROLL_NEVER}.
		*