diff options
author | Eric Erfanian <erfanian@google.com> | 2017-08-31 06:57:16 -0700 |
---|---|---|
committer | Roland Levillain <rpl@google.com> | 2017-09-04 18:05:19 +0100 |
commit | fc0eb8ccebcc7846db5e8b5c5430070055679bfa (patch) | |
tree | a8a23c3202e4161ffd57a71095a404db1bcf5735 /java/com/android/dialer/theme/res | |
parent | ea7b4dc89590ffa3332766a531e0eab6ffb9aebd (diff) |
Update Dialer source to latest internal Google revision.
Previously, Android's Dialer app was developed in an internal Google
source control system and only exported to public during AOSP drops.
The Dialer team is now switching to a public development model similar
to the telephony team.
This CL represents all internal Google changes that were committed to
Dialer between the public O release and today's tip of tree on internal
master. This CL squashes those changes into a single commit.
In subsequent changes, changes will be exported on a per-commit basis.
(cherry picked from commit 2ca4318cc1ee57dda907ba2069bd61d162b1baef
and amended to match paths of dependencies under
prebuilts/maven_repo/bumptech/com/github/bumptech/glide/.)
This CL was generated using these commands from a repository at
stage-stage-master at revision ea7b4dc89590ffa3332766a531e0eab6ffb9aebd
("Merge "Update Dialer source to latest internal Google revision." am: c39ea3c55f -s ours"):
git diff --binary 2ca4318cc1ee57dda907ba2069bd61d162b1baef | git apply -R --index
git commit -c 2ca4318cc1ee57dda907ba2069bd61d162b1baef
Test: make, flash install, run
Change-Id: I529aaeb88535b9533c0ae4ef4e6c1222d4e0f1c8
PiperOrigin-RevId: 167068436
Diffstat (limited to 'java/com/android/dialer/theme/res')
-rw-r--r-- | java/com/android/dialer/theme/res/animator/button_elevation.xml | 21 | ||||
-rw-r--r-- | java/com/android/dialer/theme/res/drawable-hdpi/ic_block_24dp.png | bin | 478 -> 0 bytes | |||
-rw-r--r-- | java/com/android/dialer/theme/res/values/colors.xml | 1 | ||||
-rw-r--r-- | java/com/android/dialer/theme/res/values/dimens.xml | 19 | ||||
-rw-r--r-- | java/com/android/dialer/theme/res/values/themes.xml | 4 |
5 files changed, 17 insertions, 28 deletions
diff --git a/java/com/android/dialer/theme/res/animator/button_elevation.xml b/java/com/android/dialer/theme/res/animator/button_elevation.xml deleted file mode 100644 index 8dd019e14..000000000 --- a/java/com/android/dialer/theme/res/animator/button_elevation.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item - android:state_enabled="true" - android:state_pressed="true"> - <objectAnimator - android:duration="@android:integer/config_shortAnimTime" - android:propertyName="translationZ" - android:valueFrom="0dp" - android:valueTo="4dp" - android:valueType="floatType"/> - </item> - <item> - <objectAnimator - android:duration="@android:integer/config_shortAnimTime" - android:propertyName="translationZ" - android:valueFrom="4dp" - android:valueTo="0dp" - android:valueType="floatType"/> - </item> -</selector> 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 Binary files differdeleted file mode 100644 index 2ccc89d24..000000000 --- a/java/com/android/dialer/theme/res/drawable-hdpi/ic_block_24dp.png +++ /dev/null diff --git a/java/com/android/dialer/theme/res/values/colors.xml b/java/com/android/dialer/theme/res/values/colors.xml index 52af142b0..0e6f54fb6 100644 --- a/java/com/android/dialer/theme/res/values/colors.xml +++ b/java/com/android/dialer/theme/res/values/colors.xml @@ -55,7 +55,6 @@ <!-- Colors for the notification actions --> <color name="notification_action_accept">#097138</color> <color name="notification_action_dismiss">#A52714</color> - <color name="notification_action_end_call">#FFFFFF</color> <color name="notification_action_answer_video">#097138</color> <!-- Background color of action bars --> diff --git a/java/com/android/dialer/theme/res/values/dimens.xml b/java/com/android/dialer/theme/res/values/dimens.xml index 8b8e61f11..ee52c97e6 100644 --- a/java/com/android/dialer/theme/res/values/dimens.xml +++ b/java/com/android/dialer/theme/res/values/dimens.xml @@ -1,12 +1,24 @@ <?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2012 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 + --> <resources> <dimen name="call_log_action_icon_margin_start">16dp</dimen> <dimen name="call_log_action_icon_dimen">24dp</dimen> <dimen name="call_log_action_horizontal_padding">24dp</dimen> - <dimen name="call_log_actions_left_padding">64dp</dimen> - <dimen name="call_log_actions_top_padding">8dp</dimen> - <dimen name="call_log_actions_bottom_padding">8dp</dimen> <dimen name="call_log_primary_text_size">16sp</dimen> <dimen name="call_log_detail_text_size">12sp</dimen> <dimen name="call_log_day_group_heading_size">14sp</dimen> @@ -23,7 +35,6 @@ <dimen name="action_bar_elevation">3dp</dimen> <dimen name="tab_height">48dp</dimen> <!-- actionbar height + tab height --> - <dimen name="actionbar_and_tab_height">107dp</dimen> <dimen name="actionbar_contentInsetStart">72dp</dimen> <dimen name="call_log_icon_margin">2dp</dimen> diff --git a/java/com/android/dialer/theme/res/values/themes.xml b/java/com/android/dialer/theme/res/values/themes.xml index 124682692..0c07f3794 100644 --- a/java/com/android/dialer/theme/res/values/themes.xml +++ b/java/com/android/dialer/theme/res/values/themes.xml @@ -56,14 +56,14 @@ <item name="android:windowAnimationStyle">@android:style/Animation</item> </style> - <style name="PrimaryText"> + <style name="PrimaryText" parent="TextAppearance.AppCompat"> <item name="android:textColor">#DE000000</item> <item name="android:textSize">16sp</item> <item name="android:ellipsize">end</item> <item name="android:maxLines">1</item> </style> - <style name="SecondaryText"> + <style name="SecondaryText" parent="TextAppearance.AppCompat"> <item name="android:textColor">#8A000000</item> <item name="android:textSize">14sp</item> <item name="android:ellipsize">end</item> |