Merge "Adding some missing annotations as per API review" (ff6fd9b1) · Commits · e / os / android_frameworks_base

api/current.txt

+4 −4

Original line number	Diff line number	Diff line
		@@ -56689,7 +56689,7 @@ package android.widget {
		method public void setLong(int, String, long);
		method public void setOnClickFillInIntent(int, android.content.Intent);
		method public void setOnClickPendingIntent(int, android.app.PendingIntent);
		method public void setOnClickResponse(int, android.widget.RemoteViews.RemoteResponse);
		method public void setOnClickResponse(int, @NonNull android.widget.RemoteViews.RemoteResponse);
		method public void setPendingIntentTemplate(int, android.app.PendingIntent);
		method public void setProgressBar(int, int, int, boolean);
		method public void setRelativeScrollPosition(int, int);
		@@ -56720,9 +56720,9 @@ package android.widget {

		public static class RemoteViews.RemoteResponse {
		ctor public RemoteViews.RemoteResponse();
		method public android.widget.RemoteViews.RemoteResponse addSharedElement(int, String);
		method public static android.widget.RemoteViews.RemoteResponse fromFillInIntent(android.content.Intent);
		method public static android.widget.RemoteViews.RemoteResponse fromPendingIntent(android.app.PendingIntent);
		method @NonNull public android.widget.RemoteViews.RemoteResponse addSharedElement(int, @NonNull String);
		method @NonNull public static android.widget.RemoteViews.RemoteResponse fromFillInIntent(@NonNull android.content.Intent);
		method @NonNull public static android.widget.RemoteViews.RemoteResponse fromPendingIntent(@NonNull android.app.PendingIntent);
		}

		@java.lang.annotation.Target({java.lang.annotation.ElementType.TYPE}) @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) public static @interface RemoteViews.RemoteView {

core/java/android/widget/RemoteViews.java

+7 −4

Original line number	Diff line number	Diff line
		@@ -2803,7 +2803,7 @@ public class RemoteViews implements Parcelable, Filter {
		* @param viewId The id of the view that will trigger the {@link RemoteResponse} when clicked
		* @param response The {@link RemoteResponse} to send when user clicks
		*/
		public void setOnClickResponse(int viewId, RemoteResponse response) {
		public void setOnClickResponse(int viewId, @NonNull RemoteResponse response) {
		addAction(new SetOnClickResponse(viewId, response));
		}

		@@ -3926,7 +3926,8 @@ public class RemoteViews implements Parcelable, Filter {
		*
		* @param pendingIntent The {@link PendingIntent} to send as part of the response
		*/
		public static RemoteResponse fromPendingIntent(PendingIntent pendingIntent) {
		@NonNull
		public static RemoteResponse fromPendingIntent(@NonNull PendingIntent pendingIntent) {
		RemoteResponse response = new RemoteResponse();
		response.mPendingIntent = pendingIntent;
		return response;
		@@ -3957,7 +3958,8 @@ public class RemoteViews implements Parcelable, Filter {
		* @see RemoteViews#setOnClickFillInIntent(int, Intent)
		* @return
		*/
		public static RemoteResponse fromFillInIntent(Intent fillIntent) {
		@NonNull
		public static RemoteResponse fromFillInIntent(@NonNull Intent fillIntent) {
		RemoteResponse response = new RemoteResponse();
		response.mFillIntent = fillIntent;
		return response;
		@@ -3974,7 +3976,8 @@ public class RemoteViews implements Parcelable, Filter {
		*
		* @see ActivityOptions#makeSceneTransitionAnimation(Activity, Pair[])
		*/
		public RemoteResponse addSharedElement(int viewId, String sharedElementName) {
		@NonNull
		public RemoteResponse addSharedElement(int viewId, @NonNull String sharedElementName) {
		if (mViewIds == null) {
		mViewIds = new IntArray();
		mElementNames = new ArrayList<>();