Merge "CastDetailsView: Remove route object in MediaRouteControllerDialog" into main (543b0879) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/app/MediaRouteControllerContentManager.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -206,6 +206,13 @@ public class MediaRouteControllerContentManager {
		mDelegate.dismissView();
		}

		/**
		* Request the media route to update volume.
		*/
		public void requestUpdateRouteVolume(int direction) {
		mRoute.requestUpdateVolume(direction);
		}

		private boolean isVolumeControlAvailable() {
		return mRoute.getVolumeHandling() == MediaRouter.RouteInfo.PLAYBACK_VOLUME_VARIABLE;
		}

+2 −9

Original line number	Diff line number	Diff line
		@@ -42,19 +42,11 @@ import com.android.internal.R;
		*/
		public class MediaRouteControllerDialog extends AlertDialog implements
		MediaRouteControllerContentManager.Delegate {
		// TODO(b/360050020): Eventually these 2 variables should be in the content manager instead of
		// here. So these should be removed when the migration is completed.
		private final MediaRouter mRouter;
		private final MediaRouter.RouteInfo mRoute;

		private final MediaRouteControllerContentManager mContentManager;

		public MediaRouteControllerDialog(Context context, int theme) {
		super(context, theme);

		mContentManager = new MediaRouteControllerContentManager(context, this);
		mRouter = (MediaRouter) context.getSystemService(Context.MEDIA_ROUTER_SERVICE);
		mRoute = mRouter.getSelectedRoute();
		}

		@Override
		@@ -91,7 +83,8 @@ public class MediaRouteControllerDialog extends AlertDialog implements
		public boolean onKeyDown(int keyCode, KeyEvent event) {
		if (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN
		\|\| keyCode == KeyEvent.KEYCODE_VOLUME_UP) {
		mRoute.requestUpdateVolume(keyCode == KeyEvent.KEYCODE_VOLUME_DOWN ? -1 : 1);
		mContentManager.requestUpdateRouteVolume(
		keyCode == KeyEvent.KEYCODE_VOLUME_DOWN ? -1 : 1);
		return true;
		}
		return super.onKeyDown(keyCode, event);