summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorAndrew Lee <anwlee@google.com>2015-05-14 15:41:24 -0700
committerAndrew Lee <anwlee@google.com>2015-05-14 17:11:55 -0700
commitc2289b3d15b93397bde2c9e6a35a995dea191fdb (patch)
tree5d275c3a3924bb772285a83b0d0a2d0cdfd0af16 /res
parenta812d28bfdac171e726d6b865e7ea5cfda24d924 (diff)
Change VM playback fragment layout.
- Remove increase/decrease playback rate functionality. - Flip button controls below the scrubber. - Delete TextController. Bug: 20433758 Change-Id: Id628bac0c9f8baed014079f2a89ce912fd2bb549
Diffstat (limited to 'res')
-rw-r--r--res/layout/playback_layout.xml126
-rw-r--r--res/values/strings.xml11
2 files changed, 45 insertions, 92 deletions
diff --git a/res/layout/playback_layout.xml b/res/layout/playback_layout.xml
index 00f1c3f4a..96feba648 100644
--- a/res/layout/playback_layout.xml
+++ b/res/layout/playback_layout.xml
@@ -19,64 +19,37 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
- android:background="@color/background_dialer_call_log_list_item"
->
- <!-- Mute, playback, trash buttons. -->
- <LinearLayout
- android:id="@+id/buttons_linear_layout"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- >
- <ImageButton
- android:id="@+id/playback_start_stop"
- android:layout_width="match_parent"
- android:layout_height="58dp"
- android:layout_marginEnd="@dimen/call_detail_button_spacing"
- android:layout_weight="1"
- android:background="?android:attr/selectableItemBackground"
- android:src="@drawable/ic_hold_pause"
- android:contentDescription="@string/voicemail_play_start_pause"
- />
- <ImageButton
- android:id="@+id/playback_speakerphone"
- android:layout_width="match_parent"
- android:layout_height="58dip"
- android:layout_weight="1"
- android:background="?android:attr/selectableItemBackground"
- android:src="@drawable/ic_speakerphone_on"
- android:contentDescription="@string/description_playback_speakerphone"
- />
- </LinearLayout>
+ android:background="@color/background_dialer_call_log_list_item">
+
<RelativeLayout
android:id="@+id/seek_container"
android:layout_width="match_parent"
- android:layout_height="80dip"
- android:layout_marginTop="@dimen/call_detail_button_spacing"
- >
- <!-- SeekBar left-right margin decreased from redlines 72dip by 8dip to account for
- half thumb width (thumb is 16dip).
+ android:layout_height="80dp"
+ android:layout_marginTop="@dimen/call_detail_button_spacing">
+
+ <!-- SeekBar left-right margin decreased from redlines 72dp by 8dp to account for
+ half thumb width (thumb is 16dp).
Vertically, SeekBar and rate buttons should be below centre, position achieved by
making them centred but giving a difference between top and bottom padding,
- difference is currently 10dip. -->
+ difference is currently 10dp. -->
<SeekBar
android:id="@+id/playback_seek"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:progressDrawable="@drawable/seekbar_drawable"
android:thumb="@drawable/ic_voicemail_seek_handle"
- android:thumbOffset="8dip"
+ android:thumbOffset="8dp"
android:progress="0"
- android:paddingStart="8dip"
- android:paddingEnd="8dip"
- android:paddingTop="30dip"
- android:paddingBottom="20dip"
- android:layout_marginEnd="64dip"
- android:layout_marginStart="64dip"
+ android:paddingStart="8dp"
+ android:paddingEnd="8dp"
+ android:paddingTop="30dp"
+ android:paddingBottom="20dp"
+ android:layout_marginEnd="64dp"
+ android:layout_marginStart="64dp"
android:max="0"
android:layout_centerVertical="true"
- android:contentDescription="@string/description_playback_seek"
- />
+ android:contentDescription="@string/description_playback_seek" />
+
<TextView
android:id="@+id/playback_position_text"
android:layout_height="wrap_content"
@@ -84,45 +57,36 @@
android:textSize="14sp"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"
- android:layout_marginTop="10dip"
- />
- <TextView
- android:id="@+id/playback_speed_text"
- android:layout_height="wrap_content"
- android:layout_width="wrap_content"
- android:textSize="14sp"
- android:layout_alignParentTop="true"
- android:layout_centerHorizontal="true"
- android:layout_marginTop="10dip"
- android:alpha="0"
- />
+ android:layout_marginTop="10dp" />
+
+ </RelativeLayout>
+
+ <!-- Playback, speakerphone buttons. -->
+ <LinearLayout
+ android:id="@+id/buttons_linear_layout"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal">
+
<ImageButton
- android:id="@+id/rate_decrease_button"
- android:src="@drawable/ic_minus"
- android:layout_width="64dip"
- android:layout_height="wrap_content"
+ android:id="@+id/playback_start_stop"
+ android:layout_width="match_parent"
+ android:layout_height="58dp"
+ android:layout_marginEnd="@dimen/call_detail_button_spacing"
+ android:layout_weight="1"
android:background="?android:attr/selectableItemBackground"
- android:paddingBottom="19dip"
- android:paddingTop="29dip"
- android:layout_alignParentStart="true"
- android:layout_centerVertical="true"
- android:contentDescription="@string/voicemail_play_slower"
- />
+ android:src="@drawable/ic_hold_pause"
+ android:contentDescription="@string/voicemail_play_start_pause" />
+
<ImageButton
- android:id="@+id/rate_increase_button"
- android:src="@drawable/ic_plus"
- android:layout_width="64dip"
- android:layout_height="wrap_content"
- android:background="?android:attr/selectableItemBackground"
- android:paddingBottom="19dip"
- android:paddingTop="29dip"
- android:layout_alignParentEnd="true"
- android:layout_centerVertical="true"
- android:contentDescription="@string/voicemail_play_faster"
- />
- <View
+ android:id="@+id/playback_speakerphone"
android:layout_width="match_parent"
- android:layout_height="2dp"
- android:layout_alignParentBottom="true"/>
- </RelativeLayout>
+ android:layout_height="58dp"
+ android:layout_weight="1"
+ android:background="?android:attr/selectableItemBackground"
+ android:src="@drawable/ic_speakerphone_on"
+ android:contentDescription="@string/description_playback_speakerphone" />
+
+ </LinearLayout>
+
</LinearLayout>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 2e236a64a..e3b268247 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -152,17 +152,6 @@
server directly to listen to the voicemails. [CHAR LIMIT=20] -->
<string name="voicemail_status_action_call_server">Call voicemail</string>
- <!-- The slowest voicemail playback speed. [CHAR LIMIT=30] -->
- <string name="voicemail_speed_slowest">Slowest speed</string>
- <!-- Slower than normal voicemail playback speed. [CHAR LIMIT=30] -->
- <string name="voicemail_speed_slower">Slow speed</string>
- <!-- Normal voicemail playback speed. [CHAR LIMIT=30] -->
- <string name="voicemail_speed_normal">Normal speed</string>
- <!-- Faster than normal pvoicemail playback speed. [CHAR LIMIT=30] -->
- <string name="voicemail_speed_faster">Fast speed</string>
- <!-- Fastest voicemail playback speed. [CHAR LIMIT=30] -->
- <string name="voicemail_speed_fastest">Fastest speed</string>
-
<!-- The counter for calls in a group and the date of the latest call as shown in the call log [CHAR LIMIT=15] -->
<string name="call_log_item_count_and_date">(<xliff:g id="count">%1$d</xliff:g>)
<xliff:g id="date">%2$s</xliff:g>