MediaControlView2: Add UX for ad mode
Add initial UX layouts for Advertisement mode
Bug: 73136129
Test: manually run VideoViewTest.apk
Change-Id: I7c0ccc052963cc97061451d365bbeda417d942ae
diff --git a/packages/MediaComponents/res/drawable/ic_arrow_back.xml b/packages/MediaComponents/res/drawable/ic_arrow_back.xml
index 5aba8c6..2b5f71e 100644
--- a/packages/MediaComponents/res/drawable/ic_arrow_back.xml
+++ b/packages/MediaComponents/res/drawable/ic_arrow_back.xml
@@ -1,6 +1,6 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="40dp"
- android:height="40dp"
+ android:width="24dp"
+ android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
diff --git a/packages/MediaComponents/res/drawable/ic_launch.xml b/packages/MediaComponents/res/drawable/ic_launch.xml
new file mode 100644
index 0000000..f7af6aa
--- /dev/null
+++ b/packages/MediaComponents/res/drawable/ic_launch.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+ <path
+ android:fillColor="#FFFFFF"
+ android:pathData="M19,19H5V5h7V3H5c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2v-7h-2v7zM14,3v2h3.59l-9.83,9.83 1.41,1.41L19,6.41V10h2V3h-7z"/>
+</vector>
\ No newline at end of file
diff --git a/packages/MediaComponents/res/layout/media_controller.xml b/packages/MediaComponents/res/layout/media_controller.xml
index dd56e7c..f9ebd44 100644
--- a/packages/MediaComponents/res/layout/media_controller.xml
+++ b/packages/MediaComponents/res/layout/media_controller.xml
@@ -24,35 +24,88 @@
<RelativeLayout
android:id="@+id/title_bar"
android:layout_width="match_parent"
- android:layout_height="wrap_content">
+ android:layout_height="wrap_content"
+ style="@style/TitleBar">
- <RadioButton
- android:id="@+id/back"
+ <LinearLayout
+ android:id="@+id/title_bar_left"
+ android:gravity="center"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_alignParentStart="true"
+ android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
- android:checked="true"
- android:visibility="gone"/>
+ android:orientation="horizontal">
- <TextView
- android:id="@+id/title_text"
+ <ImageButton
+ android:id="@+id/back"
+ android:clickable="true"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentStart="true"
+ android:layout_centerVertical="true"
+ android:paddingLeft="5dip"
+ android:visibility="visible"
+ style="@style/TitleBarButton.Back"/>
+
+ <TextView
+ android:id="@+id/title_text"
+ android:ellipsize="end"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_toRightOf="@id/back"
+ android:layout_centerVertical="true"
+ android:maxLines="1"
+ android:paddingLeft="5dip"
+ android:paddingRight="5dip"
+ android:textSize="15sp"
+ android:textColor="#FFFFFFFF"/>
+ </LinearLayout>
+
+ <LinearLayout
+ android:id="@+id/title_bar_right"
+ android:gravity="center"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_toRightOf="@id/back"
+ android:layout_alignParentRight="true"
android:layout_centerVertical="true"
- android:layout_marginLeft="15dp"
- android:paddingTop="4dp"
- android:paddingStart="4dp"
- android:paddingEnd="4dp"
- android:textSize="20sp"
- android:textColor="#FFFFFFFF" />
+ android:orientation="horizontal">
- <view class="com.android.support.mediarouter.app.MediaRouteButton" android:id="@+id/cast"
- android:layout_alignParentEnd="true"
- android:layout_centerVertical="true"
- android:visibility="gone"
- style="@style/TitleBarButton" />
+ <LinearLayout
+ android:id="@+id/ad"
+ android:clickable="true"
+ android:gravity="center"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentRight="true"
+ android:layout_centerVertical="true"
+ android:paddingLeft="5dip"
+ android:paddingRight="10dip"
+ android:orientation="horizontal">
+
+ <TextView
+ android:id="@+id/ad_text"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_centerVertical="true"
+ android:paddingRight="5dip"
+ android:text="Visit Advertiser"
+ android:textSize="10sp"
+ android:textColor="#FFFFFFFF" />
+
+ <ImageButton
+ android:id="@+id/ad_launch"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_centerVertical="true"
+ style="@style/TitleBarButton.Launch" />
+ </LinearLayout>
+
+ <view class="com.android.support.mediarouter.app.MediaRouteButton"
+ android:id="@+id/cast"
+ android:layout_centerVertical="true"
+ android:visibility="visible"
+ style="@style/TitleBarButton" />
+ </LinearLayout>
</RelativeLayout>
diff --git a/packages/MediaComponents/res/values/style.xml b/packages/MediaComponents/res/values/style.xml
index c59380c..db5e8f3 100644
--- a/packages/MediaComponents/res/values/style.xml
+++ b/packages/MediaComponents/res/values/style.xml
@@ -26,12 +26,22 @@
<item name="android:src">@drawable/ic_rewind_10</item>
</style>
+ <style name="TitleBar">
+ <item name="android:layout_height">46dp</item>
+ </style>
<style name="TitleBarButton">
<item name="android:background">@null</item>
<item name="android:layout_width">36dp</item>
<item name="android:layout_height">36dp</item>
- <item name="android:layout_margin">10dp</item>
+ </style>
+
+ <style name="TitleBarButton.Back">
+ <item name="android:src">@drawable/ic_arrow_back</item>
+ </style>
+
+ <style name="TitleBarButton.Launch">
+ <item name="android:src">@drawable/ic_launch</item>
</style>
<style name="BottomBarButton">