Update AOSP Dialer source from internal google3 repository at cl/152373142. am: d8046e520a

am: 01a8643549

Change-Id: Ib92542e6b88bc8d8906982280244661ed7dbca8f

1 files changed, 18 insertions, 23 deletions

diff --git a/java/com/android/dialer/callcomposer/res/layout/call_composer_activity.xml b/java/com/android/dialer/callcomposer/res/layout/call_composer_activity.xml
index f687f0b5c..c3f1102d1 100644
--- a/java/com/android/dialer/callcomposer/res/layout/call_composer_activity.xml
+++ b/java/com/android/dialer/callcomposer/res/layout/call_composer_activity.xml
@@ -74,12 +74,14 @@
       android:id="@+id/call_composer_view_pager"
       android:layout_width="match_parent"
       android:layout_height="@dimen/call_composer_view_pager_height"/>
+  </LinearLayout>
 
-    <FrameLayout
+  <FrameLayout
       android:layout_width="match_parent"
-      android:layout_height="wrap_content">
+      android:layout_height="wrap_content"
+      android:layout_gravity="bottom">
 
-      <LinearLayout
+    <LinearLayout
         android:id="@+id/media_actions"
         android:layout_width="match_parent"
         android:layout_height="@dimen/call_composer_media_bar_height"
@@ -88,7 +90,7 @@
         android:background="@color/dialer_secondary_color"
         android:clickable="true">
 
-        <ImageView
+      <ImageView
           android:id="@+id/call_composer_camera"
           android:layout_width="@dimen/call_composer_media_actions_width"
           android:layout_height="match_parent"
@@ -96,7 +98,7 @@
           android:src="@drawable/quantum_ic_camera_alt_white_24"
           android:background="?android:attr/selectableItemBackgroundBorderless"/>
 
-        <ImageView
+      <ImageView
           android:id="@+id/call_composer_photo"
           android:layout_width="@dimen/call_composer_media_actions_width"
           android:layout_height="match_parent"
@@ -104,22 +106,22 @@
           android:src="@drawable/quantum_ic_photo_white_24"
           android:background="?android:attr/selectableItemBackgroundBorderless"/>
 
-        <ImageView
+      <ImageView
           android:id="@+id/call_composer_message"
           android:layout_width="@dimen/call_composer_media_actions_width"
           android:layout_height="match_parent"
           android:scaleType="center"
-          android:src="@drawable/ic_message_24dp"
+          android:src="@drawable/quantum_ic_message_white_24"
           android:background="?android:attr/selectableItemBackgroundBorderless"/>
-      </LinearLayout>
+    </LinearLayout>
 
-      <FrameLayout
+    <FrameLayout
         android:id="@+id/send_and_call_button"
         android:layout_width="match_parent"
         android:layout_height="@dimen/call_composer_media_bar_height"
         android:visibility="invisible"
         android:background="@color/compose_and_call_background">
-        <TextView
+      <TextView
           android:id="@+id/send_and_call_text"
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
@@ -131,18 +133,11 @@
           android:textSize="@dimen/send_and_call_text_size"
           android:fontFamily="sans-serif-medium"
           android:textColor="@color/background_dialer_white"/>
-      </FrameLayout>
     </FrameLayout>
-  </LinearLayout>
+  </FrameLayout>
 
-  <Toolbar
-    android:id="@+id/toolbar"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:minHeight="?attr/actionBarSize"
-    android:visibility="invisible"
-    android:titleTextAppearance="@style/toolbar_title_text"
-    android:subtitleTextAppearance="@style/toolbar_subtitle_text"
-    android:navigationIcon="@drawable/quantum_ic_close_white_24"
-    android:background="@color/dialer_theme_color"/>
-</FrameLayout>
\ No newline at end of file
+  <com.android.dialer.widget.DialerToolbar
+      android:id="@+id/toolbar"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"/>
+</FrameLayout>