Merge "Add missing javadocs" into sc-dev (d1a2e3f3) · Commits · e / os / android_frameworks_base

core/java/android/app/people/ConversationStatus.java

+49 −4

Original line number	Original line	Diff line number	Diff line
	@@ -142,32 +142,52 @@ public final class ConversationStatus implements Parcelable {
	dest.writeLong(mEndTimeMs);		dest.writeLong(mEndTimeMs);
	}		}

			/**
			* Returns the unique identifier for the status.
			*/
	public @NonNull String getId() {		public @NonNull String getId() {
	return mId;		return mId;
	}		}

			/**
			* Returns the type of activity represented by this status
			*/
	public @ActivityType int getActivity() {		public @ActivityType int getActivity() {
	return mActivity;		return mActivity;
	}		}

	public @Availability		/**
	int getAvailability() {		* Returns the availability of the people behind this conversation while this activity is
			* happening.
			*/
			public @Availability int getAvailability() {
	return mAvailability;		return mAvailability;
	}		}

	public @Nullable		/**
	CharSequence getDescription() {		* Returns the description for this activity.
			*/
			public @Nullable CharSequence getDescription() {
	return mDescription;		return mDescription;
	}		}

			/**
			* Returns the image for this activity.
			*/
	public @Nullable Icon getIcon() {		public @Nullable Icon getIcon() {
	return mIcon;		return mIcon;
	}		}

			/**
			* Returns the time at which this status started
			*/
	public long getStartTimeMillis() {		public long getStartTimeMillis() {
	return mStartTimeMs;		return mStartTimeMs;
	}		}

			/**
			* Returns the time at which this status should be expired.
			*/
	public long getEndTimeMillis() {		public long getEndTimeMillis() {
	return mEndTimeMs;		return mEndTimeMs;
	}		}
	@@ -242,26 +262,51 @@ public final class ConversationStatus implements Parcelable {
	}		}


			/**
			* Sets the availability of the conversation to provide a hint about how likely
			* it is that the user would receive a timely response if they sent a message.
			*/
	public @NonNull Builder setAvailability(@Availability int availability) {		public @NonNull Builder setAvailability(@Availability int availability) {
	mAvailability = availability;		mAvailability = availability;
	return this;		return this;
	}		}

			/**
			* Sets a user visible description expanding on the conversation user(s)'s activity.
			*
			* <p>Examples include: what media someone is watching or listening to, their approximate
			* location, or what type of anniversary they are celebrating.</p>
			*/
	public @NonNull Builder setDescription(@Nullable CharSequence description) {		public @NonNull Builder setDescription(@Nullable CharSequence description) {
	mDescription = description;		mDescription = description;
	return this;		return this;
	}		}

			/**
			* Sets an image representing the conversation user(s)'s activity.
			*
			* <p>Examples include: A still from a new story update, album art, or a map showing
			* approximate location.</p>
			*/
	public @NonNull Builder setIcon(@Nullable Icon icon) {		public @NonNull Builder setIcon(@Nullable Icon icon) {
	mIcon = icon;		mIcon = icon;
	return this;		return this;
	}		}

			/**
			* Sets the time at which this status became valid.
			*/
	public @NonNull Builder setStartTimeMillis(long startTimeMs) {		public @NonNull Builder setStartTimeMillis(long startTimeMs) {
	mStartTimeMs = startTimeMs;		mStartTimeMs = startTimeMs;
	return this;		return this;
	}		}

			/**
			* Sets an expiration time for this status.
			*
			* <p>The system will remove the status at this time if it hasn't already been withdrawn.
			* </p>
			*/
	public @NonNull Builder setEndTimeMillis(long endTimeMs) {		public @NonNull Builder setEndTimeMillis(long endTimeMs) {
	mEndTimeMs = endTimeMs;		mEndTimeMs = endTimeMs;
	return this;		return this;