From d8046e520a866b9948ee9ba47cf642b441ca8e23 Mon Sep 17 00:00:00 2001
From: Eric Erfanian <erfanian@google.com>
Date: Thu, 6 Apr 2017 09:41:50 -0700
Subject: 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
---
 .../dialer/theme/res/drawable-hdpi/ic_block_24dp.png     | Bin 478 -> 0 bytes
 .../dialer/theme/res/drawable-hdpi/ic_call_arrow.png     | Bin 538 -> 0 bytes
 .../dialer/theme/res/drawable-mdpi/ic_block_24dp.png     | Bin 335 -> 0 bytes
 .../dialer/theme/res/drawable-mdpi/ic_call_arrow.png     | Bin 455 -> 0 bytes
 .../dialer/theme/res/drawable-xhdpi/ic_block_24dp.png    | Bin 665 -> 0 bytes
 .../dialer/theme/res/drawable-xhdpi/ic_call_arrow.png    | Bin 627 -> 0 bytes
 .../dialer/theme/res/drawable-xxhdpi/ic_block_24dp.png   | Bin 973 -> 0 bytes
 .../dialer/theme/res/drawable-xxhdpi/ic_call_arrow.png   | Bin 1203 -> 0 bytes
 .../dialer/theme/res/drawable-xxxhdpi/ic_block_24dp.png  | Bin 1295 -> 0 bytes
 .../dialer/theme/res/drawable-xxxhdpi/ic_call_arrow.png  | Bin 1344 -> 0 bytes
 java/com/android/dialer/theme/res/values/colors.xml      |   3 +++
 java/com/android/dialer/theme/res/values/dimens.xml      |   5 +----
 java/com/android/dialer/theme/res/values/styles.xml      |  11 -----------
 java/com/android/dialer/theme/res/values/themes.xml      |   8 ++++++++
 14 files changed, 12 insertions(+), 15 deletions(-)
 delete mode 100644 java/com/android/dialer/theme/res/drawable-hdpi/ic_block_24dp.png
 delete mode 100644 java/com/android/dialer/theme/res/drawable-hdpi/ic_call_arrow.png
 delete mode 100644 java/com/android/dialer/theme/res/drawable-mdpi/ic_block_24dp.png
 delete mode 100644 java/com/android/dialer/theme/res/drawable-mdpi/ic_call_arrow.png
 delete mode 100644 java/com/android/dialer/theme/res/drawable-xhdpi/ic_block_24dp.png
 delete mode 100644 java/com/android/dialer/theme/res/drawable-xhdpi/ic_call_arrow.png
 delete mode 100644 java/com/android/dialer/theme/res/drawable-xxhdpi/ic_block_24dp.png
 delete mode 100644 java/com/android/dialer/theme/res/drawable-xxhdpi/ic_call_arrow.png
 delete mode 100644 java/com/android/dialer/theme/res/drawable-xxxhdpi/ic_block_24dp.png
 delete mode 100644 java/com/android/dialer/theme/res/drawable-xxxhdpi/ic_call_arrow.png

(limited to 'java/com/android/dialer/theme')

diff --git a/java/com/android/dialer/theme/res/drawable-hdpi/ic_block_24dp.png b/java/com/android/dialer/theme/res/drawable-hdpi/ic_block_24dp.png
deleted file mode 100644
index 2ccc89d24..000000000
Binary files a/java/com/android/dialer/theme/res/drawable-hdpi/ic_block_24dp.png and /dev/null differ
diff --git a/java/com/android/dialer/theme/res/drawable-hdpi/ic_call_arrow.png b/java/com/android/dialer/theme/res/drawable-hdpi/ic_call_arrow.png
deleted file mode 100644
index 14a33e39f..000000000
Binary files a/java/com/android/dialer/theme/res/drawable-hdpi/ic_call_arrow.png and /dev/null differ
diff --git a/java/com/android/dialer/theme/res/drawable-mdpi/ic_block_24dp.png b/java/com/android/dialer/theme/res/drawable-mdpi/ic_block_24dp.png
deleted file mode 100644
index ec1b33f0e..000000000
Binary files a/java/com/android/dialer/theme/res/drawable-mdpi/ic_block_24dp.png and /dev/null differ
diff --git a/java/com/android/dialer/theme/res/drawable-mdpi/ic_call_arrow.png b/java/com/android/dialer/theme/res/drawable-mdpi/ic_call_arrow.png
deleted file mode 100644
index 169cf2934..000000000
Binary files a/java/com/android/dialer/theme/res/drawable-mdpi/ic_call_arrow.png and /dev/null differ
diff --git a/java/com/android/dialer/theme/res/drawable-xhdpi/ic_block_24dp.png b/java/com/android/dialer/theme/res/drawable-xhdpi/ic_block_24dp.png
deleted file mode 100644
index 7aba97b65..000000000
Binary files a/java/com/android/dialer/theme/res/drawable-xhdpi/ic_block_24dp.png and /dev/null differ
diff --git a/java/com/android/dialer/theme/res/drawable-xhdpi/ic_call_arrow.png b/java/com/android/dialer/theme/res/drawable-xhdpi/ic_call_arrow.png
deleted file mode 100644
index 6f1366018..000000000
Binary files a/java/com/android/dialer/theme/res/drawable-xhdpi/ic_call_arrow.png and /dev/null differ
diff --git a/java/com/android/dialer/theme/res/drawable-xxhdpi/ic_block_24dp.png b/java/com/android/dialer/theme/res/drawable-xxhdpi/ic_block_24dp.png
deleted file mode 100644
index fddfa54b8..000000000
Binary files a/java/com/android/dialer/theme/res/drawable-xxhdpi/ic_block_24dp.png and /dev/null differ
diff --git a/java/com/android/dialer/theme/res/drawable-xxhdpi/ic_call_arrow.png b/java/com/android/dialer/theme/res/drawable-xxhdpi/ic_call_arrow.png
deleted file mode 100644
index 0364ee015..000000000
Binary files a/java/com/android/dialer/theme/res/drawable-xxhdpi/ic_call_arrow.png and /dev/null differ
diff --git a/java/com/android/dialer/theme/res/drawable-xxxhdpi/ic_block_24dp.png b/java/com/android/dialer/theme/res/drawable-xxxhdpi/ic_block_24dp.png
deleted file mode 100644
index 0378d1bed..000000000
Binary files a/java/com/android/dialer/theme/res/drawable-xxxhdpi/ic_block_24dp.png and /dev/null differ
diff --git a/java/com/android/dialer/theme/res/drawable-xxxhdpi/ic_call_arrow.png b/java/com/android/dialer/theme/res/drawable-xxxhdpi/ic_call_arrow.png
deleted file mode 100644
index 8243c2536..000000000
Binary files a/java/com/android/dialer/theme/res/drawable-xxxhdpi/ic_call_arrow.png and /dev/null differ
diff --git a/java/com/android/dialer/theme/res/values/colors.xml b/java/com/android/dialer/theme/res/values/colors.xml
index 755c3dbe2..a31a75e4e 100644
--- a/java/com/android/dialer/theme/res/values/colors.xml
+++ b/java/com/android/dialer/theme/res/values/colors.xml
@@ -63,4 +63,7 @@
   <color name="titlebar_in_recents_background_color">@color/dialer_theme_color_dark</color>
 
   <color name="blue_grey_100">#CFD8DC</color>
+
+  <!-- Color of call type icons in call log, e.g. voicemail, video, WiFi, HD etc. -->
+  <color name="call_type_icon_color">#89000000</color>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values/dimens.xml b/java/com/android/dialer/theme/res/values/dimens.xml
index 373b33dfc..8b8e61f11 100644
--- a/java/com/android/dialer/theme/res/values/dimens.xml
+++ b/java/com/android/dialer/theme/res/values/dimens.xml
@@ -26,8 +26,5 @@
   <dimen name="actionbar_and_tab_height">107dp</dimen>
   <dimen name="actionbar_contentInsetStart">72dp</dimen>
 
-  <dimen name="toolbar_title_text_size">14sp</dimen>
-  <dimen name="toolbar_subtitle_text_size">12sp</dimen>
-
-  <dimen name="call_log_icon_margin">4dp</dimen>
+  <dimen name="call_log_icon_margin">2dp</dimen>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values/styles.xml b/java/com/android/dialer/theme/res/values/styles.xml
index b5e89ff48..ac94d0687 100644
--- a/java/com/android/dialer/theme/res/values/styles.xml
+++ b/java/com/android/dialer/theme/res/values/styles.xml
@@ -53,15 +53,4 @@
     <item name="android:background">@color/actionbar_background_color</item>
     <item name="background">@color/actionbar_background_color</item>
   </style>
-
-  <style name="toolbar_title_text">
-    <item name="android:textSize">@dimen/toolbar_title_text_size</item>
-    <item name="android:textColor">@color/background_dialer_white</item>
-    <item name="android:fontFamily">sans-serif-medium</item>
-  </style>
-
-  <style name="toolbar_subtitle_text">
-    <item name="android:textSize">@dimen/toolbar_subtitle_text_size</item>
-    <item name="android:textColor">@color/background_dialer_white</item>
-  </style>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values/themes.xml b/java/com/android/dialer/theme/res/values/themes.xml
index 452b36929..0d0c45f90 100644
--- a/java/com/android/dialer/theme/res/values/themes.xml
+++ b/java/com/android/dialer/theme/res/values/themes.xml
@@ -18,4 +18,12 @@
     <item name="android:actionBarSize">@dimen/action_bar_height</item>
     <item name="actionBarSize">@dimen/action_bar_height</item>
   </style>
+
+  <style name="Theme.AppCompat.Translucent" parent="Theme.AppCompat.NoActionBar">
+    <item name="android:windowNoTitle">true</item>
+    <item name="android:windowBackground">@android:color/transparent</item>
+    <item name="android:colorBackgroundCacheHint">@null</item>
+    <item name="android:windowIsTranslucent">true</item>
+    <item name="android:windowAnimationStyle">@android:style/Animation</item>
+  </style>
 </resources>
-- 
cgit v1.2.3