Update AOSP Dialer source from internal google3 repository at

cl/152373142.

Test: make, treehugger

This CL updates the AOSP Dialer source with all the changes that have
gone into the private google3 repository. This includes all the
changes from cl/151342913 (3/27/2017) to cl/152373142 (4/06/2017).

This goal of these drops is to keep the AOSP source in sync with the
internal google3 repository. Currently these sync are done by hand
with very minor modifications to the internal source code.
See the Android.mk file for list of modifications.
Our current goal is to do frequent drops (daily if possible) and
eventually switched to an automated process.

Change-Id: I2fbc88cf6867b90ac8b65f75e5e34468988c7217

2 files changed, 47 insertions, 0 deletions

diff --git a/java/com/android/dialer/widget/res/layout/dialer_toolbar.xml b/java/com/android/dialer/widget/res/layout/dialer_toolbar.xml
new file mode 100644
index 000000000..c4aac65fb
--- /dev/null
+++ b/java/com/android/dialer/widget/res/layout/dialer_toolbar.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2017 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+
+  <LinearLayout
+      android:orientation="vertical"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_gravity="center_vertical">
+
+    <TextView
+        android:id="@+id/title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="top"
+        android:textSize="@dimen/toolbar_title_text_size"
+        android:textColor="@color/background_dialer_white"
+        android:fontFamily="sans-serif-medium"/>
+
+    <TextView
+        android:id="@+id/subtitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textSize="@dimen/toolbar_subtitle_text_size"
+        android:textColor="@color/background_dialer_white"
+        android:visibility="gone"/>
+  </LinearLayout>
+</merge>
\ No newline at end of file
diff --git a/java/com/android/dialer/widget/res/values/dimens.xml b/java/com/android/dialer/widget/res/values/dimens.xml
index 6c4ea604f..0b1c1f15b 100644
--- a/java/com/android/dialer/widget/res/values/dimens.xml
+++ b/java/com/android/dialer/widget/res/values/dimens.xml
@@ -20,4 +20,9 @@
   <dimen name="textview_item_padding">16dp</dimen>
   <dimen name="message_remaining_char_text_size">12sp</dimen>
   <dimen name="message_divider_height">1dp</dimen>
+
+  <dimen name="toolbar_title_text_size">20sp</dimen>
+  <dimen name="toolbar_title_small_text_size">14sp</dimen>
+  <dimen name="toolbar_subtitle_text_size">12sp</dimen>
+  <dimen name="toolbar_elevation">4dp</dimen>
 </resources>
\ No newline at end of file