Merge "Add MediaRoute2Info#TYPE_REMOTE_SMARTPHONE" (d307ab0c) · Commits · e / os / android_frameworks_base

core/api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -24384,6 +24384,7 @@ package android.media {
		field public static final int TYPE_REMOTE_CAR = 1008; // 0x3f0
		field public static final int TYPE_REMOTE_COMPUTER = 1006; // 0x3ee
		field public static final int TYPE_REMOTE_GAME_CONSOLE = 1007; // 0x3ef
		field public static final int TYPE_REMOTE_SMARTPHONE = 1010; // 0x3f2
		field public static final int TYPE_REMOTE_SMARTWATCH = 1009; // 0x3f1
		field public static final int TYPE_REMOTE_SPEAKER = 1002; // 0x3ea
		field public static final int TYPE_REMOTE_TABLET = 1004; // 0x3ec

media/java/android/media/MediaRoute2Info.java

+13 −22

Original line number	Diff line number	Diff line
		@@ -156,6 +156,7 @@ public final class MediaRoute2Info implements Parcelable {
		TYPE_REMOTE_GAME_CONSOLE,
		TYPE_REMOTE_CAR,
		TYPE_REMOTE_SMARTWATCH,
		TYPE_REMOTE_SMARTPHONE,
		TYPE_GROUP
		})
		@Retention(RetentionPolicy.SOURCE)
		@@ -336,6 +337,16 @@ public final class MediaRoute2Info implements Parcelable {
		*/
		public static final int TYPE_REMOTE_SMARTWATCH = 1009;

		/**
		* Indicates the route is a remote smartphone.
		*
		* <p>A remote device uses a routing protocol managed by the application, as opposed to the
		* routing being done by the system.
		*
		* @see #getType
		*/
		public static final int TYPE_REMOTE_SMARTPHONE = 1010;

		/**
		* Indicates the route is a group of devices.
		*
		@@ -542,28 +553,6 @@ public final class MediaRoute2Info implements Parcelable {

		/**
		* Returns the type of this route.
		*
		* @see #TYPE_UNKNOWN
		* @see #TYPE_BUILTIN_SPEAKER
		* @see #TYPE_WIRED_HEADSET
		* @see #TYPE_WIRED_HEADPHONES
		* @see #TYPE_BLUETOOTH_A2DP
		* @see #TYPE_HDMI
		* @see #TYPE_DOCK
		* @see #TYPE_USB_DEVICE
		* @see #TYPE_USB_ACCESSORY
		* @see #TYPE_USB_HEADSET
		* @see #TYPE_HEARING_AID
		* @see #TYPE_REMOTE_TV
		* @see #TYPE_REMOTE_SPEAKER
		* @see #TYPE_REMOTE_AUDIO_VIDEO_RECEIVER
		* @see #TYPE_REMOTE_TABLET
		* @see #TYPE_REMOTE_TABLET_DOCKED
		* @see #TYPE_REMOTE_COMPUTER
		* @see #TYPE_REMOTE_GAME_CONSOLE
		* @see #TYPE_REMOTE_CAR
		* @see #TYPE_REMOTE_SMARTWATCH
		* @see #TYPE_GROUP
		*/
		@Type
		public int getType() {
		@@ -946,6 +935,8 @@ public final class MediaRoute2Info implements Parcelable {
		return "REMOTE_CAR";
		case TYPE_REMOTE_SMARTWATCH:
		return "REMOTE_SMARTWATCH";
		case TYPE_REMOTE_SMARTPHONE:
		return "REMOTE_SMARTPHONE";
		case TYPE_GROUP:
		return "GROUP";
		case TYPE_UNKNOWN:

packages/SettingsLib/src/com/android/settingslib/media/InfoMediaDevice.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ import static android.media.MediaRoute2Info.TYPE_GROUP;
		import static android.media.MediaRoute2Info.TYPE_REMOTE_CAR;
		import static android.media.MediaRoute2Info.TYPE_REMOTE_COMPUTER;
		import static android.media.MediaRoute2Info.TYPE_REMOTE_GAME_CONSOLE;
		import static android.media.MediaRoute2Info.TYPE_REMOTE_SMARTPHONE;
		import static android.media.MediaRoute2Info.TYPE_REMOTE_SMARTWATCH;
		import static android.media.MediaRoute2Info.TYPE_REMOTE_SPEAKER;
		import static android.media.MediaRoute2Info.TYPE_REMOTE_TABLET;
		@@ -103,6 +104,9 @@ public class InfoMediaDevice extends MediaDevice {
		case TYPE_REMOTE_SMARTWATCH:
		resId = R.drawable.ic_media_smartwatch;
		break;
		case TYPE_REMOTE_SMARTPHONE:
		resId = R.drawable.ic_smartphone;
		break;
		case TYPE_REMOTE_SPEAKER:
		default:
		resId = R.drawable.ic_media_speaker_device;

packages/SettingsLib/src/com/android/settingslib/media/InfoMediaManager.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@ import static android.media.MediaRoute2Info.TYPE_REMOTE_AUDIO_VIDEO_RECEIVER;
		import static android.media.MediaRoute2Info.TYPE_REMOTE_CAR;
		import static android.media.MediaRoute2Info.TYPE_REMOTE_COMPUTER;
		import static android.media.MediaRoute2Info.TYPE_REMOTE_GAME_CONSOLE;
		import static android.media.MediaRoute2Info.TYPE_REMOTE_SMARTPHONE;
		import static android.media.MediaRoute2Info.TYPE_REMOTE_SMARTWATCH;
		import static android.media.MediaRoute2Info.TYPE_REMOTE_SPEAKER;
		import static android.media.MediaRoute2Info.TYPE_REMOTE_TABLET;
		@@ -566,8 +567,8 @@ public abstract class InfoMediaManager extends MediaManager {
		case TYPE_REMOTE_GAME_CONSOLE:
		case TYPE_REMOTE_CAR:
		case TYPE_REMOTE_SMARTWATCH:
		mediaDevice =
		createInfoMediaDevice(route, mPreferenceItemMap.get(route.getId()));
		case TYPE_REMOTE_SMARTPHONE:
		mediaDevice = createInfoMediaDevice(route, mPreferenceItemMap.get(route.getId()));
		break;
		case TYPE_BUILTIN_SPEAKER:
		case TYPE_USB_DEVICE:

packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/InfoMediaDeviceTest.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ import static android.media.MediaRoute2Info.TYPE_GROUP;
		import static android.media.MediaRoute2Info.TYPE_REMOTE_CAR;
		import static android.media.MediaRoute2Info.TYPE_REMOTE_COMPUTER;
		import static android.media.MediaRoute2Info.TYPE_REMOTE_GAME_CONSOLE;
		import static android.media.MediaRoute2Info.TYPE_REMOTE_SMARTPHONE;
		import static android.media.MediaRoute2Info.TYPE_REMOTE_SMARTWATCH;
		import static android.media.MediaRoute2Info.TYPE_REMOTE_SPEAKER;
		import static android.media.MediaRoute2Info.TYPE_REMOTE_TABLET;
		@@ -143,5 +144,9 @@ public class InfoMediaDeviceTest {

		assertThat(mInfoMediaDevice.getDrawableResIdByType()).isEqualTo(
		R.drawable.ic_media_smartwatch);

		when(mRouteInfo.getType()).thenReturn(TYPE_REMOTE_SMARTPHONE);

		assertThat(mInfoMediaDevice.getDrawableResIdByType()).isEqualTo(R.drawable.ic_smartphone);
		}
		}