Merge "Be more specific about media statuses" into sc-dev (e363bcdb) · Commits · e / os / android_frameworks_base

core/api/current.txt

+5 −4

Original line number	Diff line number	Diff line
		@@ -8006,13 +8006,14 @@ package android.app.people {
		method public long getStartTimeMillis();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field public static final int ACTIVITY_ANNIVERSARY = 2; // 0x2
		field public static final int ACTIVITY_AUDIO = 4; // 0x4
		field public static final int ACTIVITY_BIRTHDAY = 1; // 0x1
		field public static final int ACTIVITY_GAME = 5; // 0x5
		field public static final int ACTIVITY_LOCATION = 6; // 0x6
		field public static final int ACTIVITY_MEDIA = 4; // 0x4
		field public static final int ACTIVITY_GAME = 6; // 0x6
		field public static final int ACTIVITY_LOCATION = 7; // 0x7
		field public static final int ACTIVITY_NEW_STORY = 3; // 0x3
		field public static final int ACTIVITY_OTHER = 0; // 0x0
		field public static final int ACTIVITY_UPCOMING_BIRTHDAY = 7; // 0x7
		field public static final int ACTIVITY_UPCOMING_BIRTHDAY = 8; // 0x8
		field public static final int ACTIVITY_VIDEO = 5; // 0x5
		field public static final int AVAILABILITY_AVAILABLE = 0; // 0x0
		field public static final int AVAILABILITY_BUSY = 1; // 0x1
		field public static final int AVAILABILITY_OFFLINE = 2; // 0x2

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

+39 −5

Original line number	Diff line number	Diff line
		@@ -36,7 +36,8 @@ public final class ConversationStatus implements Parcelable {
		ACTIVITY_BIRTHDAY,
		ACTIVITY_ANNIVERSARY,
		ACTIVITY_NEW_STORY,
		ACTIVITY_MEDIA,
		ACTIVITY_AUDIO,
		ACTIVITY_VIDEO,
		ACTIVITY_GAME,
		ACTIVITY_LOCATION,
		ACTIVITY_UPCOMING_BIRTHDAY
		@@ -44,14 +45,47 @@ public final class ConversationStatus implements Parcelable {
		@Retention(RetentionPolicy.SOURCE)
		public @interface ActivityType {}

		/**
		* Constant representing that the conversation user is engaged in an activity that cannot be
		* more specifically represented by another type.
		*/
		public static final int ACTIVITY_OTHER = 0;
		/**
		* Constant representing that today is the conversation user's birthday.
		*/
		public static final int ACTIVITY_BIRTHDAY = 1;
		/**
		* Constant representing that the conversation user and the device user are celebrating
		* and anniversary today.
		*/
		public static final int ACTIVITY_ANNIVERSARY = 2;
		/**
		* Constant representing that the conversation user has posted a new story.
		*/
		public static final int ACTIVITY_NEW_STORY = 3;
		public static final int ACTIVITY_MEDIA = 4;
		public static final int ACTIVITY_GAME = 5;
		public static final int ACTIVITY_LOCATION = 6;
		public static final int ACTIVITY_UPCOMING_BIRTHDAY = 7;
		/**
		* Constant representing that the conversation user is listening to music or other audio
		* like a podcast.
		*/
		public static final int ACTIVITY_AUDIO = 4;
		/**
		* Constant representing that the conversation user is watching video content.
		*/
		public static final int ACTIVITY_VIDEO = 5;
		/**
		* Constant representing that the conversation user is playing a game.
		*/
		public static final int ACTIVITY_GAME = 6;
		/**
		* Constant representing that the conversation user is sharing status with the device user.
		* Use this to represent a general 'this person is sharing their location with you' status or
		* a more specific 'this is the current location of this person' status.
		*/
		public static final int ACTIVITY_LOCATION = 7;
		/**
		* Constant representing that the conversation user's birthday is approaching soon.
		*/
		public static final int ACTIVITY_UPCOMING_BIRTHDAY = 8;

		/** @hide */
		@IntDef(prefix = { "AVAILABILITY_" }, value = {

packages/SystemUI/src/com/android/systemui/people/PeopleSpaceUtils.java

+5 −2

Original line number	Diff line number	Diff line
		@@ -19,12 +19,13 @@ package com.android.systemui.people;
		import static android.app.Notification.CATEGORY_MISSED_CALL;
		import static android.app.Notification.EXTRA_MESSAGES;
		import static android.app.people.ConversationStatus.ACTIVITY_ANNIVERSARY;
		import static android.app.people.ConversationStatus.ACTIVITY_AUDIO;
		import static android.app.people.ConversationStatus.ACTIVITY_BIRTHDAY;
		import static android.app.people.ConversationStatus.ACTIVITY_GAME;
		import static android.app.people.ConversationStatus.ACTIVITY_LOCATION;
		import static android.app.people.ConversationStatus.ACTIVITY_MEDIA;
		import static android.app.people.ConversationStatus.ACTIVITY_NEW_STORY;
		import static android.app.people.ConversationStatus.ACTIVITY_UPCOMING_BIRTHDAY;
		import static android.app.people.ConversationStatus.ACTIVITY_VIDEO;
		import static android.app.people.ConversationStatus.AVAILABILITY_AVAILABLE;
		import static android.appwidget.AppWidgetManager.OPTION_APPWIDGET_MAX_HEIGHT;
		import static android.appwidget.AppWidgetManager.OPTION_APPWIDGET_MAX_WIDTH;
		@@ -496,8 +497,10 @@ public class PeopleSpaceUtils {
		return context.getString(R.string.location_status);
		case ACTIVITY_NEW_STORY:
		return context.getString(R.string.new_story_status);
		case ACTIVITY_MEDIA:
		case ACTIVITY_VIDEO:
		return context.getString(R.string.video_status);
		case ACTIVITY_AUDIO:
		return context.getString(R.string.audio_status);
		case ACTIVITY_GAME:
		return context.getString(R.string.game_status);
		default: