Merge "Fix layout so that all 4 buttons show on smaller screens." into nyc-dev

am: 40026e882f

* commit '40026e882fa3e5bdc897606e4cb96ed6ac1bfbb9':
  Fix layout so that all 4 buttons show on smaller screens.

1 files changed, 71 insertions, 73 deletions

diff --git a/res/layout/voicemail_playback_layout.xml b/res/layout/voicemail_playback_layout.xml
index 64a68bdd2..4d5f74f2d 100644
--- a/res/layout/voicemail_playback_layout.xml
+++ b/res/layout/voicemail_playback_layout.xml
@@ -34,91 +34,89 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
-        android:gravity="top">
+        android:gravity="center_vertical"
+        android:paddingTop="@dimen/voicemail_playback_top_padding">
 
         <TextView
             android:id="@+id/playback_position_text"
             android:layout_height="wrap_content"
             android:layout_width="wrap_content"
             android:textSize="14sp"
-            android:paddingTop="@dimen/voicemail_playback_top_padding"
             android:importantForAccessibility="no" />
 
-        <LinearLayout
+        <SeekBar
+            android:id="@+id/playback_seek"
             android:layout_width="0dp"
-            android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:orientation="vertical"
-            android:layout_marginTop="4dp">
-
-            <SeekBar
-                android:id="@+id/playback_seek"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingBottom="8dp"
-                android:paddingTop="@dimen/voicemail_playback_top_padding"
-                android:progressDrawable="@drawable/seekbar_drawable"
-                android:thumb="@drawable/ic_voicemail_seek_handle"
-                android:progress="0"
-                android:max="0"
-                android:contentDescription="@string/description_playback_seek" />
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:gravity="center"
-                android:padding="8dp">
-
-                <ImageButton android:id="@+id/playback_speakerphone"
-                    style="@style/VoicemailPlaybackLayoutButtonStyle"
-                    android:src="@drawable/ic_volume_down_24dp"
-                    android:tint="@color/voicemail_icon_tint"
-                    android:contentDescription="@string/description_playback_speakerphone" />
-
-                <Space
-                    android:layout_width="0dp"
-                    android:layout_height="0dp"
-                    android:layout_weight="1" />
-
-                <ImageButton android:id="@+id/playback_start_stop"
-                    style="@style/VoicemailPlaybackLayoutButtonStyle"
-                    android:src="@drawable/ic_play_arrow"
-                    android:contentDescription="@string/voicemail_play_start_pause" />
-
-                <Space
-                    android:layout_width="0dp"
-                    android:layout_height="0dp"
-                    android:layout_weight="1" />
-
-                <ImageButton android:id="@+id/delete_voicemail"
-                    style="@style/VoicemailPlaybackLayoutButtonStyle"
-                    android:src="@drawable/ic_delete_24dp"
-                    android:tint="@color/voicemail_icon_tint"
-                    android:contentDescription="@string/call_log_trash_voicemail" />
-
-                <Space
-                    android:layout_width="0dp"
-                    android:layout_height="0dp"
-                    android:layout_weight="1" />
-
-                <ImageButton android:id="@+id/archive_voicemail"
-                    style="@style/VoicemailPlaybackLayoutButtonStyle"
-                    android:src="@drawable/ic_archive_white_24dp"
-                    android:tint="@color/voicemail_icon_tint"
-                    android:contentDescription="@string/call_log_archive_voicemail" />
-
-            </LinearLayout>
-
-        </LinearLayout>
+            android:layout_height="wrap_content"
+            android:progressDrawable="@drawable/seekbar_drawable"
+            android:thumb="@drawable/ic_voicemail_seek_handle"
+            android:progress="0"
+            android:max="0"
+            android:contentDescription="@string/description_playback_seek" />
 
-    <TextView
-        android:id="@+id/total_duration_text"
+        <TextView
+            android:id="@+id/total_duration_text"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:textSize="14sp"
+            android:importantForAccessibility="no" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:textSize="14sp"
-        android:paddingTop="@dimen/voicemail_playback_top_padding"
-        android:importantForAccessibility="no" />
+        android:orientation="horizontal"
+        android:gravity="center">
+
+        <Space
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"/>
+
+        <ImageButton android:id="@+id/playback_speakerphone"
+            style="@style/VoicemailPlaybackLayoutButtonStyle"
+            android:src="@drawable/ic_volume_down_24dp"
+            android:tint="@color/voicemail_icon_tint"
+            android:contentDescription="@string/description_playback_speakerphone" />
+
+        <Space
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"/>
+
+        <ImageButton android:id="@+id/playback_start_stop"
+            style="@style/VoicemailPlaybackLayoutButtonStyle"
+            android:src="@drawable/ic_play_arrow"
+            android:contentDescription="@string/voicemail_play_start_pause" />
+
+        <Space
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"/>
+
+        <ImageButton android:id="@+id/delete_voicemail"
+            style="@style/VoicemailPlaybackLayoutButtonStyle"
+            android:src="@drawable/ic_delete_24dp"
+            android:tint="@color/voicemail_icon_tint"
+            android:contentDescription="@string/call_log_trash_voicemail" />
+
+        <Space
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"/>
+
+        <ImageButton android:id="@+id/archive_voicemail"
+            style="@style/VoicemailPlaybackLayoutButtonStyle"
+            android:src="@drawable/ic_archive_white_24dp"
+            android:tint="@color/voicemail_icon_tint"
+            android:contentDescription="@string/call_log_archive_voicemail" />
+
+        <Space
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"/>
 
     </LinearLayout>