Merge "Update gradient strength to spec" into main (b281da20) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/media/controls/ui/binder/MediaControlViewBinder.kt

+13 −6

Original line number	Diff line number	Diff line
		@@ -49,9 +49,10 @@ import com.android.systemui.media.controls.ui.util.MediaArtworkHelper
		import com.android.systemui.media.controls.ui.view.MediaViewHolder
		import com.android.systemui.media.controls.ui.viewmodel.MediaActionViewModel
		import com.android.systemui.media.controls.ui.viewmodel.MediaControlViewModel
		import com.android.systemui.media.controls.ui.viewmodel.MediaControlViewModel.Companion.MEDIA_PLAYER_SCRIM_CENTER_ALPHA
		import com.android.systemui.media.controls.ui.viewmodel.MediaControlViewModel.Companion.MEDIA_PLAYER_SCRIM_END_ALPHA
		import com.android.systemui.media.controls.ui.viewmodel.MediaControlViewModel.Companion.MEDIA_PLAYER_SCRIM_END_ALPHA_LEGACY
		import com.android.systemui.media.controls.ui.viewmodel.MediaControlViewModel.Companion.MEDIA_PLAYER_SCRIM_START_ALPHA
		import com.android.systemui.media.controls.ui.viewmodel.MediaControlViewModel.Companion.MEDIA_PLAYER_SCRIM_START_ALPHA_LEGACY
		import com.android.systemui.media.controls.ui.viewmodel.MediaControlViewModel.Companion.SEMANTIC_ACTIONS_ALL
		import com.android.systemui.media.controls.ui.viewmodel.MediaControlViewModel.Companion.SEMANTIC_ACTIONS_COMPACT
		import com.android.systemui.media.controls.ui.viewmodel.MediaOutputSwitcherViewModel
		@@ -537,18 +538,24 @@ object MediaControlViewBinder {
		height: Int,
		): LayerDrawable {
		val albumArt = MediaArtworkHelper.getScaledBackground(context, artworkIcon, width, height)
		val alpha =
		val startAlpha =
		if (Flags.mediaControlsA11yColors()) {
		MEDIA_PLAYER_SCRIM_CENTER_ALPHA
		} else {
		MEDIA_PLAYER_SCRIM_START_ALPHA
		} else {
		MEDIA_PLAYER_SCRIM_START_ALPHA_LEGACY
		}
		val endAlpha =
		if (Flags.mediaControlsA11yColors()) {
		MEDIA_PLAYER_SCRIM_END_ALPHA
		} else {
		MEDIA_PLAYER_SCRIM_END_ALPHA_LEGACY
		}
		return MediaArtworkHelper.setUpGradientColorOnDrawable(
		albumArt,
		context.getDrawable(R.drawable.qs_media_scrim)?.mutate() as GradientDrawable,
		mutableColorScheme,
		alpha,
		MEDIA_PLAYER_SCRIM_END_ALPHA,
		startAlpha,
		endAlpha,
		)
		}

packages/SystemUI/src/com/android/systemui/media/controls/ui/controller/MediaControlPanel.java

+9 −7

Original line number	Diff line number	Diff line
		@@ -23,7 +23,10 @@ import static com.android.systemui.Flags.communalHub;
		import static com.android.systemui.Flags.mediaLockscreenLaunchAnimation;
		import static com.android.systemui.media.controls.domain.pipeline.MediaActionsKt.getNotificationActions;
		import static com.android.systemui.media.controls.shared.model.SmartspaceMediaDataKt.NUM_REQUIRED_RECOMMENDATIONS;
		import static com.android.systemui.media.controls.ui.viewmodel.MediaControlViewModel.MEDIA_PLAYER_SCRIM_CENTER_ALPHA;
		import static com.android.systemui.media.controls.ui.viewmodel.MediaControlViewModel.MEDIA_PLAYER_SCRIM_END_ALPHA;
		import static com.android.systemui.media.controls.ui.viewmodel.MediaControlViewModel.MEDIA_PLAYER_SCRIM_END_ALPHA_LEGACY;
		import static com.android.systemui.media.controls.ui.viewmodel.MediaControlViewModel.MEDIA_PLAYER_SCRIM_START_ALPHA;
		import static com.android.systemui.media.controls.ui.viewmodel.MediaControlViewModel.MEDIA_PLAYER_SCRIM_START_ALPHA_LEGACY;

		import android.animation.Animator;
		import android.animation.AnimatorInflater;
		@@ -176,9 +179,7 @@ public class MediaControlPanel {
		protected static final int SMARTSPACE_CARD_DISMISS_EVENT = 761;

		private static final float REC_MEDIA_COVER_SCALE_FACTOR = 1.25f;
		private static final float MEDIA_SCRIM_START_ALPHA = 0.25f;
		private static final float MEDIA_REC_SCRIM_START_ALPHA = 0.15f;
		private static final float MEDIA_PLAYER_SCRIM_END_ALPHA = 1.0f;
		private static final float MEDIA_REC_SCRIM_END_ALPHA = 1.0f;

		private static final Intent SETTINGS_INTENT = new Intent(ACTION_MEDIA_CONTROLS_SETTINGS);
		@@ -1093,11 +1094,12 @@ public class MediaControlPanel {
		Drawable albumArt = getScaledBackground(artworkIcon, width, height);
		GradientDrawable gradient = (GradientDrawable) mContext.getDrawable(
		R.drawable.qs_media_scrim).mutate();
		float startAlpha = (Flags.mediaControlsA11yColors())
		? MEDIA_PLAYER_SCRIM_CENTER_ALPHA
		: MEDIA_SCRIM_START_ALPHA;
		if (Flags.mediaControlsA11yColors()) {
		return setupGradientColorOnDrawable(albumArt, gradient, mutableColorScheme,
		MEDIA_PLAYER_SCRIM_START_ALPHA, MEDIA_PLAYER_SCRIM_END_ALPHA);
		}
		return setupGradientColorOnDrawable(albumArt, gradient, mutableColorScheme,
		startAlpha, MEDIA_PLAYER_SCRIM_END_ALPHA);
		MEDIA_PLAYER_SCRIM_START_ALPHA_LEGACY, MEDIA_PLAYER_SCRIM_END_ALPHA_LEGACY);
		}

		@VisibleForTesting

packages/SystemUI/src/com/android/systemui/media/controls/ui/viewmodel/MediaControlViewModel.kt

+5 −3

Original line number	Diff line number	Diff line
		@@ -419,8 +419,10 @@ class MediaControlViewModel(

		const val TURBULENCE_NOISE_PLAY_MS_DURATION = 7500L
		@Deprecated("Remove with media_controls_a11y_colors flag")
		const val MEDIA_PLAYER_SCRIM_START_ALPHA = 0.25f
		const val MEDIA_PLAYER_SCRIM_CENTER_ALPHA = 0.75f
		const val MEDIA_PLAYER_SCRIM_END_ALPHA = 1.0f
		const val MEDIA_PLAYER_SCRIM_START_ALPHA_LEGACY = 0.25f
		@Deprecated("Remove with media_controls_a11y_colors flag")
		const val MEDIA_PLAYER_SCRIM_END_ALPHA_LEGACY = 1.0f
		const val MEDIA_PLAYER_SCRIM_START_ALPHA = 0.65f
		const val MEDIA_PLAYER_SCRIM_END_ALPHA = 0.75f
		}
		}