Don't hard code the colors of media button
Fixes: 124767050
Test: manual
Change-Id: Ia9d8df8a97c9760d8e35f10cf976ba27ca7066f7
diff --git a/car-media-common/res/color/playback_control_color.xml b/car-media-common/res/color/playback_control_color.xml
index 73655f7..4a946f7 100644
--- a/car-media-common/res/color/playback_control_color.xml
+++ b/car-media-common/res/color/playback_control_color.xml
@@ -15,5 +15,6 @@
limitations under the License.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:color="@color/icon_tint" />
+ <item android:state_enabled="false" android:color="@color/media_button_tint_disabled"/>
+ <item android:color="@color/media_button_tint" />
</selector>
diff --git a/car-media-common/res/values/colors.xml b/car-media-common/res/values/colors.xml
index 6f9e489..51927a7 100644
--- a/car-media-common/res/values/colors.xml
+++ b/car-media-common/res/values/colors.xml
@@ -39,6 +39,9 @@
<!-- Color used on the fab spinner -->
<color name="fab_spinner_indeterminate_color">@color/media_source_default_color</color>
+ <!-- Color used on media control buttons -->
+ <color name="media_button_tint">#FFFFFFFF</color>
+ <color name="media_button_tint_disabled">#80FFFFFF</color>
<color name="placeholder_color_0">#669DF6</color>
<color name="placeholder_color_1">#667EF6</color>
diff --git a/car-media-common/src/com/android/car/media/common/MediaButtonController.java b/car-media-common/src/com/android/car/media/common/MediaButtonController.java
index b7bfa19..c281ff7 100644
--- a/car-media-common/src/com/android/car/media/common/MediaButtonController.java
+++ b/car-media-common/src/com/android/car/media/common/MediaButtonController.java
@@ -53,8 +53,6 @@
public class MediaButtonController {
private static final String TAG = "MediaButton";
- private static final float ALPHA_ENABLED = 1.0F;
- private static final float ALPHA_DISABLED = 0.5F;
private Context mContext;
private PlayPauseStopImageView mPlayPauseStopImageView;
@@ -175,12 +173,6 @@
mControlBar.setView(null, ControlBar.SLOT_LEFT);
mSkipPrevAdded = false;
}
-
- if (skipPreviousEnabled) {
- mSkipPrevButton.setAlpha(ALPHA_ENABLED);
- } else {
- mSkipPrevButton.setAlpha(ALPHA_DISABLED);
- }
mSkipPrevButton.setEnabled(skipPreviousEnabled);
boolean skipNextReserved = hasState && state.isSkipNextReserved();
@@ -195,12 +187,6 @@
mControlBar.setView(null, ControlBar.SLOT_RIGHT);
mSkipNextAdded = false;
}
-
- if (skipNextEnabled) {
- mSkipNextButton.setAlpha(ALPHA_ENABLED);
- } else {
- mSkipNextButton.setAlpha(ALPHA_DISABLED);
- }
mSkipNextButton.setEnabled(skipNextEnabled);
updateCustomActions(state);
