MediaControlView2: Add Music UX
1. Create Music View inside VideoView2
- Dynamically change layouts based on size and orientation
- Disable touch when Full size mode
2. Create Music Mode button settings inside MediaControlView2
Bug: 73873457
Test: Manually run VideoViewTest.apk
Change-Id: Iba47ab40b7eb24147c09efbe997bd8e765719d69
diff --git a/packages/MediaComponents/res/values/dimens.xml b/packages/MediaComponents/res/values/dimens.xml
index 8d72d40..62bc196 100644
--- a/packages/MediaComponents/res/values/dimens.xml
+++ b/packages/MediaComponents/res/values/dimens.xml
@@ -62,5 +62,8 @@
<dimen name="mcv2_minimal_icon_size">24dp</dimen>
<dimen name="mcv2_icon_margin">10dp</dimen>
+ <dimen name="mcv2_full_album_image_portrait_size">232dp</dimen>
+ <dimen name="mcv2_full_album_image_landscape_size">176dp</dimen>
+
<!-- TODO: adjust bottom bar view -->
</resources>
diff --git a/packages/MediaComponents/res/values/strings.xml b/packages/MediaComponents/res/values/strings.xml
index aaceac8..2597a3b 100644
--- a/packages/MediaComponents/res/values/strings.xml
+++ b/packages/MediaComponents/res/values/strings.xml
@@ -129,6 +129,10 @@
<string name="MediaControlView2_audio_track_number_text">
Track <xliff:g id="audio_number" example="1">%1$s</xliff:g>
</string>
+ <!-- Text for displaying unknown song title. -->
+ <string name="mcv2_music_title_unknown_text">Song title unknown</string>
+ <!-- Text for displaying unknown artist name. -->
+ <string name="mcv2_music_artist_unknown_text">Artist unknown</string>
<!--Content Descriptions -->
<string name="mcv2_back_button_desc">Back</string>
diff --git a/packages/MediaComponents/res/values/style.xml b/packages/MediaComponents/res/values/style.xml
index 0be04e6..76a21c4 100644
--- a/packages/MediaComponents/res/values/style.xml
+++ b/packages/MediaComponents/res/values/style.xml
@@ -95,7 +95,10 @@
</style>
<style name="TitleBar">
+ <item name="android:layout_width">match_parent</item>
<item name="android:layout_height">46dp</item>
+ <item name="android:layout_marginLeft">5dp</item>
+ <item name="android:layout_marginRight">5dp</item>
</style>
<style name="TitleBarButton">
@@ -182,4 +185,39 @@
<item name="android:src">@drawable/ic_high_quality</item>
<item name="android:contentDescription">@string/mcv2_video_quality_button_desc</item>
</style>
+
+ <style name="FullMusicPortrait">
+ <item name="android:layout_height">0dp</item>
+ </style>
+
+ <style name="FullMusicPortrait.Image">
+ <item name="android:layout_width">match_parent</item>
+ <item name="android:layout_weight">0.6</item>
+ <item name="android:gravity">center</item>
+ </style>
+
+ <style name="FullMusicPortrait.Text">
+ <item name="android:layout_width">match_parent</item>
+ <item name="android:layout_weight">0.4</item>
+ <item name="android:gravity">top|center</item>
+ <item name="android:orientation">vertical</item>
+ </style>
+
+ <style name="FullMusicLandscape">
+ <item name="android:layout_width">0dp</item>
+ </style>
+
+ <style name="FullMusicLandscape.Image">
+ <item name="android:layout_height">match_parent</item>
+ <item name="android:layout_weight">0.35</item>
+ <item name="android:gravity">center|right</item>
+ </style>
+
+ <style name="FullMusicLandscape.Text">
+ <item name="android:layout_height">match_parent</item>
+ <item name="android:layout_weight">0.65</item>
+ <item name="android:layout_marginLeft">24dp</item>
+ <item name="android:gravity">center|left</item>
+ <item name="android:orientation">vertical</item>
+ </style>
</resources>