Merge "Add seekbar to Voicemail Media Player"

4 files changed, 81 insertions, 19 deletions

diff --git a/java/com/android/dialer/voicemail/listui/res/layout/new_voicemail_entry.xml b/java/com/android/dialer/voicemail/listui/res/layout/new_voicemail_entry.xml
index 78d2785e9..95769fe32 100644
--- a/java/com/android/dialer/voicemail/listui/res/layout/new_voicemail_entry.xml
+++ b/java/com/android/dialer/voicemail/listui/res/layout/new_voicemail_entry.xml
@@ -97,7 +97,6 @@
       android:layout_width="@dimen/call_log_entry_menu_button_size"
       android:layout_height="@dimen/call_log_entry_menu_button_size"
       android:layout_alignParentEnd="true"
-      android:layout_centerVertical="true"
       android:scaleType="center"
       android:src="@drawable/quantum_ic_more_vert_vd_theme_24"
       android:tint="@color/dialer_secondary_text_color"/>
diff --git a/java/com/android/dialer/voicemail/listui/res/layout/new_voicemail_media_player_layout.xml b/java/com/android/dialer/voicemail/listui/res/layout/new_voicemail_media_player_layout.xml
index 762782fb5..a21b6aa6c 100644
--- a/java/com/android/dialer/voicemail/listui/res/layout/new_voicemail_media_player_layout.xml
+++ b/java/com/android/dialer/voicemail/listui/res/layout/new_voicemail_media_player_layout.xml
@@ -15,24 +15,76 @@
   ~ limitations under the License
   -->
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="horizontal"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
-  <!-- TODO(a bug): Remove these buttons as this is a place holder for the Media Player -->
-  <Button
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:text="Play"
-      android:id="@+id/playButton" />
-  <Button
-      android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:paddingTop="@dimen/voicemail_media_player_padding_top"
+    android:orientation="vertical">
+
+  <!-- TODO(uabdullah): Make visibility gone (once implement fetching from vm server) -->
+  <TextView
+      android:id="@+id/playback_state_text"
+      android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      android:text="Speaker"
-      android:id="@+id/speakerButton" />
-  <Button
-      android:layout_width="wrap_content"
+      android:gravity="center"
+      android:text="@string/voicemail_media_player_state"
+      android:textSize="@dimen/voicemail_playback_state_text_size"
+      android:visibility="gone"/>
+
+  <LinearLayout
+      android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      android:text="Delete"
-      android:id="@+id/deleteButton" />
-</LinearLayout>
+      android:gravity="center_vertical"
+      android:orientation="horizontal">
+
+    <TextView
+        android:id="@+id/playback_position_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:importantForAccessibility="no"
+        android:text="@string/voicemail_media_player_inital_start_position"
+        android:textSize="@dimen/voicemail_duration_size"/>
+
+    <!-- TODO(uabdullah): Add listener to seekbar -->
+    <SeekBar
+        android:id="@+id/playback_seek"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:max="0"
+        android:progress="0"/>
+
+    <!-- TODO(uabdullah): Remove android:text and replace with real value when binding -->
+    <TextView
+        android:id="@+id/playback_seek_total_duration"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:importantForAccessibility="no"
+        android:text="03:00"
+        android:textSize="@dimen/voicemail_duration_size"/>
+  </LinearLayout>
+
+  <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
+      android:paddingTop="10dp"
+      android:orientation="horizontal">
+    <!-- TODO(a bug): Remove these buttons as this is a place holder for the Media Player -->
+    <Button
+        android:id="@+id/playButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Play"/>
+    <Button
+        android:id="@+id/speakerButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Speaker"/>
+    <Button
+        android:id="@+id/deleteButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Delete"/>
+  </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/java/com/android/dialer/voicemail/listui/res/values/dimens.xml b/java/com/android/dialer/voicemail/listui/res/values/dimens.xml
index 3df5827a5..6c062ae28 100644
--- a/java/com/android/dialer/voicemail/listui/res/values/dimens.xml
+++ b/java/com/android/dialer/voicemail/listui/res/values/dimens.xml
@@ -27,4 +27,8 @@
 
   <dimen name="voicemail_icon_margin">12dp</dimen>
   <dimen name="voicemail_icon_size">16dp</dimen>
+
+  <dimen name="voicemail_playback_state_text_size">14sp</dimen>
+  <dimen name="voicemail_media_player_padding_top">20dp</dimen>
+  <dimen name="voicemail_duration_size">14sp</dimen>
 </resources>
diff --git a/java/com/android/dialer/voicemail/listui/res/values/strings.xml b/java/com/android/dialer/voicemail/listui/res/values/strings.xml
index a7df0ce8f..508f67436 100644
--- a/java/com/android/dialer/voicemail/listui/res/values/strings.xml
+++ b/java/com/android/dialer/voicemail/listui/res/values/strings.xml
@@ -20,4 +20,11 @@
 
   <!-- Format for duration of voicemails which are displayed when viewing voicemail. For example "01:22" -->
   <string name="voicemailDurationFormat"><xliff:g example="10" id="minutes">%1$02d</xliff:g>:<xliff:g example="20" id="seconds">%2$02d</xliff:g></string>
+
+  <!-- TODO(ubdullah): Confirm string with UX before allowing translation -->
+  <!-- String used to display the state of the voicemail media player -->
+  <string name="voicemail_media_player_state" translatable="false">Loading Voicemail</string>
+
+  <!-- String used to display the default staring point of a voicemail-->
+  <string name="voicemail_media_player_inital_start_position" translatable="false">00:00</string>
 </resources>
\ No newline at end of file