Split regular and minimized play/stop button layout
Split regular and minimized play/stop/pause button layouts to make it
possible to change the appearance of the two independently (inline or
using overlays).
Bug: 149904701
Test: manual
Change-Id: Ib043c8cf34140f9b6c7f4dbb27c9dafc54db5419
(cherry picked from commit a6bf4dc8d48e39a9792c7cde480a17b524078c5a)
diff --git a/car-media-common/res/layout/minimized_play_pause_stop_button_layout.xml b/car-media-common/res/layout/minimized_play_pause_stop_button_layout.xml
new file mode 100644
index 0000000..38389b0
--- /dev/null
+++ b/car-media-common/res/layout/minimized_play_pause_stop_button_layout.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (C) 2020 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+<FrameLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/play_pause_container"
+ android:focusable="false"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content">
+ <!-- The invisible foreground ripple stops Android O from drawing an ugly square over the play button -->
+ <com.android.car.media.common.PlayPauseStopImageView
+ android:id="@+id/play_pause_stop"
+ style="@style/Widget.ActionButton"
+ android:foreground="@drawable/fab_empty_foreground"
+ android:src="@drawable/ic_play_pause_stop_animated"/>
+ <ProgressBar
+ android:id="@+id/circular_progress_bar"
+ android:layout_width="@dimen/fab_spinner_size"
+ android:layout_height="@dimen/fab_spinner_size"
+ android:layout_gravity="center"
+ android:padding="9dp"
+ android:indeterminateDrawable="@drawable/music_buffering"
+ android:indeterminateTint="@color/fab_spinner_indeterminate_color"
+ android:progressDrawable="@drawable/circular_progress_bar"
+ android:progressTint="@color/minimized_progress_bar_highlight"
+ android:progressBackgroundTint="@color/minimized_progress_bar_background"
+ android:focusable="false"
+ android:indeterminateOnly="false"/>
+</FrameLayout>
diff --git a/car-media-common/src/com/android/car/media/common/MinimizedPlaybackControlBar.java b/car-media-common/src/com/android/car/media/common/MinimizedPlaybackControlBar.java
index 9cfda34..17a37b2 100644
--- a/car-media-common/src/com/android/car/media/common/MinimizedPlaybackControlBar.java
+++ b/car-media-common/src/com/android/car/media/common/MinimizedPlaybackControlBar.java
@@ -62,7 +62,7 @@
private void init(Context context) {
mMediaButtonController = new MediaButtonController(context, this,
- R.color.playback_control_color, R.layout.play_pause_stop_button_layout,
+ R.color.playback_control_color, R.layout.minimized_play_pause_stop_button_layout,
R.drawable.ic_skip_previous, R.drawable.ic_skip_next);
mShowLinearProgressBar = context.getResources().getBoolean(R.bool.show_linear_progress_bar);
