summaryrefslogtreecommitdiff
path: root/java/com/android/dialer/theme
diff options
context:
space:
mode:
authorEric Erfanian <erfanian@google.com>2017-04-06 09:41:50 -0700
committerEric Erfanian <erfanian@google.com>2017-04-06 09:41:50 -0700
commitd8046e520a866b9948ee9ba47cf642b441ca8e23 (patch)
tree8d08d4f2292aa84dc435d455891e7ab633d95a25 /java/com/android/dialer/theme
parentcdb1edf966a892abebcba425a85b7d4e47758302 (diff)
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
Diffstat (limited to 'java/com/android/dialer/theme')
-rw-r--r--java/com/android/dialer/theme/res/drawable-hdpi/ic_block_24dp.pngbin478 -> 0 bytes
-rw-r--r--java/com/android/dialer/theme/res/drawable-hdpi/ic_call_arrow.pngbin538 -> 0 bytes
-rw-r--r--java/com/android/dialer/theme/res/drawable-mdpi/ic_block_24dp.pngbin335 -> 0 bytes
-rw-r--r--java/com/android/dialer/theme/res/drawable-mdpi/ic_call_arrow.pngbin455 -> 0 bytes
-rw-r--r--java/com/android/dialer/theme/res/drawable-xhdpi/ic_block_24dp.pngbin665 -> 0 bytes
-rw-r--r--java/com/android/dialer/theme/res/drawable-xhdpi/ic_call_arrow.pngbin627 -> 0 bytes
-rw-r--r--java/com/android/dialer/theme/res/drawable-xxhdpi/ic_block_24dp.pngbin973 -> 0 bytes
-rw-r--r--java/com/android/dialer/theme/res/drawable-xxhdpi/ic_call_arrow.pngbin1203 -> 0 bytes
-rw-r--r--java/com/android/dialer/theme/res/drawable-xxxhdpi/ic_block_24dp.pngbin1295 -> 0 bytes
-rw-r--r--java/com/android/dialer/theme/res/drawable-xxxhdpi/ic_call_arrow.pngbin1344 -> 0 bytes
-rw-r--r--java/com/android/dialer/theme/res/values/colors.xml3
-rw-r--r--java/com/android/dialer/theme/res/values/dimens.xml5
-rw-r--r--java/com/android/dialer/theme/res/values/styles.xml11
-rw-r--r--java/com/android/dialer/theme/res/values/themes.xml8
14 files changed, 12 insertions, 15 deletions
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
--- a/java/com/android/dialer/theme/res/drawable-hdpi/ic_block_24dp.png
+++ /dev/null
Binary files 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
--- a/java/com/android/dialer/theme/res/drawable-hdpi/ic_call_arrow.png
+++ /dev/null
Binary files 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
--- a/java/com/android/dialer/theme/res/drawable-mdpi/ic_block_24dp.png
+++ /dev/null
Binary files 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
--- a/java/com/android/dialer/theme/res/drawable-mdpi/ic_call_arrow.png
+++ /dev/null
Binary files 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
--- a/java/com/android/dialer/theme/res/drawable-xhdpi/ic_block_24dp.png
+++ /dev/null
Binary files 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
--- a/java/com/android/dialer/theme/res/drawable-xhdpi/ic_call_arrow.png
+++ /dev/null
Binary files 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
--- a/java/com/android/dialer/theme/res/drawable-xxhdpi/ic_block_24dp.png
+++ /dev/null
Binary files 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
--- a/java/com/android/dialer/theme/res/drawable-xxhdpi/ic_call_arrow.png
+++ /dev/null
Binary files 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
--- a/java/com/android/dialer/theme/res/drawable-xxxhdpi/ic_block_24dp.png
+++ /dev/null
Binary files 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
--- a/java/com/android/dialer/theme/res/drawable-xxxhdpi/ic_call_arrow.png
+++ /dev/null
Binary files 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>