Merge "Avoid loading action icons when possible" (2501671b) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/media/MediaControlPanel.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -331,7 +331,7 @@ public class MediaControlPanel {
		int actionId = ACTION_IDS[i];
		final ImageButton button = mViewHolder.getAction(actionId);
		MediaAction mediaAction = actionIcons.get(i);
		button.setImageDrawable(mediaAction.getDrawable());
		button.setImageIcon(mediaAction.getIcon());
		button.setContentDescription(mediaAction.getContentDescription());
		Runnable action = mediaAction.getAction();

+1 −1

Original line number	Diff line number	Diff line
		@@ -109,7 +109,7 @@ data class MediaData(

		/** State of a media action. */
		data class MediaAction(
		val drawable: Drawable?,
		val icon: Icon?,
		val action: Runnable?,
		val contentDescription: CharSequence?
		)

+7 −2

Original line number	Diff line number	Diff line
		@@ -501,8 +501,13 @@ class MediaDataManager(
		} else {
		null
		}
		val mediaActionIcon = if (action.getIcon()?.getType() == Icon.TYPE_RESOURCE) {
		Icon.createWithResource(packageContext, action.getIcon()!!.getResId())
		} else {
		action.getIcon()
		}
		val mediaAction = MediaAction(
		action.getIcon().loadDrawable(packageContext),
		mediaActionIcon,
		runnable,
		action.title)
		actionIcons.add(mediaAction)
		@@ -612,7 +617,7 @@ class MediaDataManager(

		private fun getResumeMediaAction(action: Runnable): MediaAction {
		return MediaAction(
		context.getDrawable(R.drawable.lb_ic_play),
		Icon.createWithResource(context, R.drawable.lb_ic_play),
		action,
		context.getString(R.string.controls_media_resume)
		)