Update Dialer source from latest green build.

* Refactor voicemail component
* Add new enriched calling components

Test: treehugger, manual aosp testing

Change-Id: I521a0f86327d4b42e14d93927c7d613044ed5942

3 files changed, 45 insertions, 41 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 518b53ffd..f687f0b5c 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
@@ -120,13 +120,14 @@
         android:visibility="invisible"
         android:background="@color/compose_and_call_background">
         <TextView
+          android:id="@+id/send_and_call_text"
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           android:layout_gravity="center"
           android:drawableStart="@drawable/quantum_ic_call_white_18"
           android:drawablePadding="@dimen/send_and_call_drawable_padding"
           android:textAllCaps="true"
-          android:text="@string/send_and_call"
+          android:text="@string/share_and_call"
           android:textSize="@dimen/send_and_call_text_size"
           android:fontFamily="sans-serif-medium"
           android:textColor="@color/background_dialer_white"/>
@@ -140,8 +141,8 @@
     android:layout_height="wrap_content"
     android:minHeight="?attr/actionBarSize"
     android:visibility="invisible"
-    android:titleTextAppearance="@style/call_composer_toolbar_title_text"
-    android:subtitleTextAppearance="@style/call_composer_toolbar_subtitle_text"
+    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
diff --git a/java/com/android/dialer/callcomposer/res/layout/fragment_gallery_composer.xml b/java/com/android/dialer/callcomposer/res/layout/fragment_gallery_composer.xml
index 58893ba50..a4bd4df03 100644
--- a/java/com/android/dialer/callcomposer/res/layout/fragment_gallery_composer.xml
+++ b/java/com/android/dialer/callcomposer/res/layout/fragment_gallery_composer.xml
@@ -27,7 +27,7 @@
     android:paddingLeft="@dimen/gallery_item_padding"
     android:paddingRight="@dimen/gallery_item_padding"
     android:paddingTop="@dimen/gallery_item_padding"
-    android:numColumns="3"/>
+    android:numColumns="@integer/gallery_composer_grid_view_rows"/>
 
   <include
     android:id="@+id/permission_view"
diff --git a/java/com/android/dialer/callcomposer/res/layout/fragment_message_composer.xml b/java/com/android/dialer/callcomposer/res/layout/fragment_message_composer.xml
index 97f232b3a..577887be9 100644
--- a/java/com/android/dialer/callcomposer/res/layout/fragment_message_composer.xml
+++ b/java/com/android/dialer/callcomposer/res/layout/fragment_message_composer.xml
@@ -15,43 +15,45 @@
   ~ limitations under the License
   -->
 <LinearLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_width="match_parent"
-  android:layout_height="@dimen/call_composer_view_pager_height"
-  android:orientation="vertical"
-  android:gravity="bottom"
-  android:background="@color/background_dialer_white">
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/call_composer_view_pager_height"
+    android:orientation="vertical"
+    android:gravity="bottom"
+    android:background="@color/background_dialer_white">
 
   <TextView
-    android:id="@+id/message_urgent"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:text="@string/urgent"
-    style="@style/message_composer_textview"/>
+      android:id="@+id/message_urgent"
+      android:layout_width="match_parent"
+      android:layout_height="56dp"
+      android:layout_marginTop="8dp"
+      android:text="@string/urgent"
+      style="@style/message_composer_textview"/>
 
   <TextView
-    android:id="@+id/message_chat"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:text="@string/want_to_chat"
-    style="@style/message_composer_textview"/>
+      android:id="@+id/message_chat"
+      android:layout_width="match_parent"
+      android:layout_height="56dp"
+      android:text="@string/want_to_chat"
+      style="@style/message_composer_textview"/>
 
   <TextView
-    android:id="@+id/message_question"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:text="@string/quick_question"
-    style="@style/message_composer_textview"/>
+      android:id="@+id/message_question"
+      android:layout_width="match_parent"
+      android:layout_height="56dp"
+      android:layout_marginBottom="8dp"
+      android:text="@string/quick_question"
+      style="@style/message_composer_textview"/>
 
   <View
-    android:layout_width="match_parent"
-    android:layout_height="@dimen/message_composer_divider_height"
-    android:background="@color/call_composer_divider"/>
+      android:layout_width="match_parent"
+      android:layout_height="@dimen/message_composer_divider_height"
+      android:background="@color/call_composer_divider"/>
 
   <RelativeLayout
-    android:orientation="horizontal"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
+      android:orientation="horizontal"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content">
 
     <EditText
       android:id="@+id/custom_message"
@@ -59,21 +61,22 @@
       android:layout_height="wrap_content"
       android:padding="@dimen/message_composer_item_padding"
       android:textSize="@dimen/message_compose_item_text_size"
-      android:hint="@string/custom_message_hint"
+      android:hint="@string/message_composer_custom_message_hint"
       android:textColor="@color/dialer_primary_text_color"
       android:textColorHint="@color/dialer_edit_text_hint_color"
       android:background="@color/background_dialer_white"
       android:textCursorDrawable="@drawable/searchedittext_custom_cursor"
-      android:layout_toLeftOf="@+id/remaining_characters"/>
+      android:layout_toStartOf="@+id/remaining_characters"
+      android:imeOptions="flagNoExtractUi"/>
 
     <TextView
-      android:id="@+id/remaining_characters"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_marginRight="@dimen/message_composer_item_padding"
-      android:layout_alignParentRight="true"
-      android:layout_centerVertical="true"
-      android:textSize="@dimen/message_compose_remaining_char_text_size"
-      android:textColor="@color/dialer_edit_text_hint_color"/>
+        android:id="@+id/remaining_characters"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="@dimen/message_composer_item_padding"
+        android:layout_alignParentEnd="true"
+        android:layout_centerVertical="true"
+        android:textSize="@dimen/message_compose_remaining_char_text_size"
+        android:textColor="@color/dialer_edit_text_hint_color"/>
   </RelativeLayout>
 </LinearLayout>
\ No newline at end of file