summaryrefslogtreecommitdiffstats
path: root/res/layout
diff options
context:
space:
mode:
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/call_detail.xml18
-rw-r--r--res/layout/call_detail_history_item.xml18
-rw-r--r--res/layout/playback_layout.xml44
3 files changed, 35 insertions, 45 deletions
diff --git a/res/layout/call_detail.xml b/res/layout/call_detail.xml
index 9ca30a898..f08531b0c 100644
--- a/res/layout/call_detail.xml
+++ b/res/layout/call_detail.xml
@@ -15,17 +15,16 @@
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:layout_height="match_parent" >
<LinearLayout
android:id="@+id/call_detail"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
- android:background="@color/background_dialer_list_items"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
- >
+ android:background="@color/background_dialer_list_items" >
<!-- Caller information "card" -->
<LinearLayout
android:id="@+id/caller_information"
@@ -39,7 +38,7 @@
android:gravity="center_vertical"
android:translationZ="@dimen/call_detail_translation_z"
android:focusable="true"
- android:background="@color/background_dialer_white">
+ android:background="@color/background_dialer_white" >
<QuickContactBadge
android:id="@+id/quick_contact_photo"
@@ -85,11 +84,20 @@
>
<include layout="@layout/call_log_voicemail_status"/>
</FrameLayout>
+ <TextView
+ android:id="@+id/voicemail_transcription"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingStart="@dimen/call_detail_horizontal_margin"
+ android:paddingEnd="@dimen/call_detail_horizontal_margin"
+ android:paddingTop="@dimen/transcription_top_margin"
+ android:paddingBottom="@dimen/transcription_bottom_margin"
+ android:background="@color/background_dialer_list_items" />
<LinearLayout
android:id="@+id/voicemail_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="horizontal"
+ android:orientation="vertical"
android:paddingBottom="@dimen/call_detail_button_spacing"
android:visibility="gone"
>
diff --git a/res/layout/call_detail_history_item.xml b/res/layout/call_detail_history_item.xml
index cc06d2151..0e5dcf2f4 100644
--- a/res/layout/call_detail_history_item.xml
+++ b/res/layout/call_detail_history_item.xml
@@ -23,41 +23,35 @@
android:paddingStart="@dimen/call_detail_horizontal_margin"
android:paddingEnd="@dimen/call_log_outer_margin"
android:orientation="vertical"
- android:background="@color/background_dialer_list_items"
->
+ android:background="@color/background_dialer_list_items" >
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:orientation="horizontal"
- >
+ android:orientation="horizontal" >
<view
class="com.android.dialer.calllog.CallTypeIconsView"
android:id="@+id/call_type_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- />
+ android:layout_gravity="center_vertical" />
<TextView
android:id="@+id/call_type_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/call_log_icon_margin"
android:textColor="?attr/call_log_primary_text_color"
- android:textSize="@dimen/call_log_primary_text_size"
- />
+ android:textSize="@dimen/call_log_primary_text_size" />
</LinearLayout>
<TextView
android:id="@+id/date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="?attr/call_log_secondary_text_color"
- android:textSize="@dimen/call_log_secondary_text_size"
- />
+ android:textSize="@dimen/call_log_secondary_text_size" />
<TextView
android:id="@+id/duration"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="?attr/call_log_secondary_text_color"
- android:textSize="@dimen/call_log_secondary_text_size"
- />
+ android:textSize="@dimen/call_log_secondary_text_size" />
</LinearLayout>
diff --git a/res/layout/playback_layout.xml b/res/layout/playback_layout.xml
index 2f4d33c7a..500ed96b5 100644
--- a/res/layout/playback_layout.xml
+++ b/res/layout/playback_layout.xml
@@ -14,10 +14,11 @@
limitations under the License.
-->
-<RelativeLayout
+<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:orientation="vertical"
android:background="@color/background_dialer_list_items"
>
<!-- Mute, playback, trash buttons. -->
@@ -26,44 +27,31 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
- android:layout_alignParentTop="true"
>
- <LinearLayout
+ <ImageButton
+ android:id="@+id/playback_start_stop"
android:layout_width="match_parent"
- android:layout_height="58dip"
+ android:layout_height="58dp"
android:layout_marginEnd="@dimen/call_detail_button_spacing"
android:layout_weight="1"
- >
- <ImageButton
- android:id="@+id/playback_start_stop"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="?android:attr/selectableItemBackground"
- android:src="@drawable/ic_hold_pause"
- android:contentDescription="@string/voicemail_play_start_pause"
- />
- </LinearLayout>
- <LinearLayout
+ 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="@color/background_dialer_list_items"
- >
- <ImageButton
- android:id="@+id/playback_speakerphone"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="?android:attr/selectableItemBackground"
- android:src="@drawable/ic_speakerphone_on"
- android:contentDescription="@string/description_playback_speakerphone"
- />
- </LinearLayout>
+ android:background="?android:attr/selectableItemBackground"
+ android:src="@drawable/ic_speakerphone_on"
+ android:contentDescription="@string/description_playback_speakerphone"
+ />
</LinearLayout>
<RelativeLayout
android:id="@+id/seek_container"
android:layout_width="match_parent"
android:layout_height="80dip"
- android:layout_below="@id/buttons_linear_layout"
android:layout_marginTop="@dimen/call_detail_button_spacing"
>
<!-- SeekBar left-right margin decreased from redlines 72dip by 8dip to account for
@@ -137,4 +125,4 @@
android:layout_height="2dp"
android:layout_alignParentBottom="true"/>
</RelativeLayout>
-</RelativeLayout>
+</LinearLayout>