summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorNancy Chen <nancychen@google.com>2014-07-29 12:04:52 -0700
committerNancy Chen <nancychen@google.com>2014-07-29 12:24:16 -0700
commitcb6909f223dc75958a6048405e106ead2ad5edc2 (patch)
tree34e43b91933841d2d3aaae9a2ffb64ae95225a17 /res
parentf4d66dc977378701fcb26bef879da0d457dde956 (diff)
downloadandroid_packages_apps_PhoneCommon-cb6909f223dc75958a6048405e106ead2ad5edc2.tar.gz
android_packages_apps_PhoneCommon-cb6909f223dc75958a6048405e106ead2ad5edc2.tar.bz2
android_packages_apps_PhoneCommon-cb6909f223dc75958a6048405e106ead2ad5edc2.zip
Update dialpad style with new colors and new voicemail icon
Color changes for secondary text color and icon. Bug: 16356911 Bug: 15859030 Change-Id: Ibf8a8500204ff7d59860aa9f7db9940446747cb1
Diffstat (limited to 'res')
-rw-r--r--res/drawable-hdpi/ic_dialpad_vm.pngbin554 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_dialpad_voicemail.pngbin0 -> 623 bytes
-rw-r--r--res/drawable-mdpi/ic_dialpad_vm.pngbin450 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_dialpad_voicemail.pngbin0 -> 504 bytes
-rw-r--r--res/drawable-xhdpi/ic_dialpad_vm.pngbin672 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_dialpad_voicemail.pngbin0 -> 787 bytes
-rw-r--r--res/drawable-xxhdpi/ic_dialpad_vm.pngbin1502 -> 0 bytes
-rw-r--r--res/drawable-xxhdpi/ic_dialpad_voicemail.pngbin0 -> 1578 bytes
-rw-r--r--res/layout-land/dialpad_key_one.xml2
-rw-r--r--res/layout/dialpad_key_one.xml2
-rw-r--r--res/values/colors.xml4
-rw-r--r--res/values/dimens.xml6
-rw-r--r--res/values/styles.xml6
13 files changed, 12 insertions, 8 deletions
diff --git a/res/drawable-hdpi/ic_dialpad_vm.png b/res/drawable-hdpi/ic_dialpad_vm.png
deleted file mode 100644
index 9501300..0000000
--- a/res/drawable-hdpi/ic_dialpad_vm.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_dialpad_voicemail.png b/res/drawable-hdpi/ic_dialpad_voicemail.png
new file mode 100644
index 0000000..4706112
--- /dev/null
+++ b/res/drawable-hdpi/ic_dialpad_voicemail.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_dialpad_vm.png b/res/drawable-mdpi/ic_dialpad_vm.png
deleted file mode 100644
index f32d8bf..0000000
--- a/res/drawable-mdpi/ic_dialpad_vm.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_dialpad_voicemail.png b/res/drawable-mdpi/ic_dialpad_voicemail.png
new file mode 100644
index 0000000..e84d8f4
--- /dev/null
+++ b/res/drawable-mdpi/ic_dialpad_voicemail.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_dialpad_vm.png b/res/drawable-xhdpi/ic_dialpad_vm.png
deleted file mode 100644
index 5d87c50..0000000
--- a/res/drawable-xhdpi/ic_dialpad_vm.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_dialpad_voicemail.png b/res/drawable-xhdpi/ic_dialpad_voicemail.png
new file mode 100644
index 0000000..0b4e183
--- /dev/null
+++ b/res/drawable-xhdpi/ic_dialpad_voicemail.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_dialpad_vm.png b/res/drawable-xxhdpi/ic_dialpad_vm.png
deleted file mode 100644
index ac20fab..0000000
--- a/res/drawable-xxhdpi/ic_dialpad_vm.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_dialpad_voicemail.png b/res/drawable-xxhdpi/ic_dialpad_voicemail.png
new file mode 100644
index 0000000..a0a7c9d
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_dialpad_voicemail.png
Binary files differ
diff --git a/res/layout-land/dialpad_key_one.xml b/res/layout-land/dialpad_key_one.xml
index 2890fd1..d5ec1be 100644
--- a/res/layout-land/dialpad_key_one.xml
+++ b/res/layout-land/dialpad_key_one.xml
@@ -37,7 +37,7 @@
android:layout_height="wrap_content"
android:paddingTop="@dimen/dialpad_voicemail_icon_padding_top"
android:id="@+id/dialpad_key_voicemail"
- android:src="@drawable/ic_dialpad_vm"
+ android:src="@drawable/ic_dialpad_voicemail"
android:scaleType="fitCenter"
android:layout_centerInParent="true"
android:tint="@color/dialpad_secondary_text_color" />
diff --git a/res/layout/dialpad_key_one.xml b/res/layout/dialpad_key_one.xml
index dfb444a..a7f5aaa 100644
--- a/res/layout/dialpad_key_one.xml
+++ b/res/layout/dialpad_key_one.xml
@@ -30,7 +30,7 @@
android:layout_height="wrap_content"
android:paddingTop="@dimen/dialpad_voicemail_icon_padding_top"
android:id="@+id/dialpad_key_voicemail"
- android:src="@drawable/ic_dialpad_vm"
+ android:src="@drawable/ic_dialpad_voicemail"
android:scaleType="fitCenter"
android:layout_centerInParent="true"
android:tint="@color/dialpad_secondary_text_color" />
diff --git a/res/values/colors.xml b/res/values/colors.xml
index eb4450c..2c24b05 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -21,8 +21,8 @@
<color name="background_dialpad">#fcfcfc</color>
<color name="background_dialpad_pressed">#ececec</color>
<color name="dialpad_primary_text_color">@color/dialer_theme_color</color>
- <color name="dialpad_secondary_text_color">#cc737373</color>
- <color name="dialpad_digits_text_color">#666666</color>
+ <color name="dialpad_secondary_text_color">#737373</color>
+ <color name="dialpad_digits_text_color">#333</color>
<color name="dialpad_separator_line_color">#dadada</color>
<color name="dialpad_icon_tint">#b3b3b3</color>
</resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index a3e04c2..67947dd 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -17,9 +17,9 @@
<resources>
<!-- Text dimensions for dialpad keys -->
<dimen name="dialpad_key_numbers_size">36sp</dimen>
- <dimen name="dialpad_key_letters_size">8sp</dimen>
+ <dimen name="dialpad_key_letters_size">12sp</dimen>
<dimen name="dialpad_key_pound_size">23sp</dimen>
- <dimen name="dialpad_key_star_size">28sp</dimen>
+ <dimen name="dialpad_key_star_size">36sp</dimen>
<dimen name="dialpad_key_height">64dp</dimen>
<dimen name="dialpad_key_number_margin_bottom">2dp</dimen>
<dimen name="dialpad_symbol_margin_bottom">13dp</dimen>
@@ -27,7 +27,7 @@
<dimen name="dialpad_bottom_key_height">65dp</dimen>
<dimen name="dialpad_key_plus_size">18sp</dimen>
<dimen name="dialpad_horizontal_padding">5dp</dimen>
- <dimen name="dialpad_digits_text_size">36sp</dimen>
+ <dimen name="dialpad_digits_text_size">34sp</dimen>
<dimen name="dialpad_digits_text_min_size">24sp</dimen>
<dimen name="dialpad_digits_height">64dp</dimen>
<dimen name="dialpad_digits_padding">16dp</dimen>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 5297aa1..5685c92 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -34,6 +34,8 @@
<style name="DialpadKeyStarStyle">
<item name="android:textColor">@color/dialpad_secondary_text_color</item>
<item name="android:textSize">@dimen/dialpad_key_star_size</item>
+ <item name="android:fontFamily">sans-serif-light</item>
+ <item name="android:alpha">0.8</item>
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_marginBottom">@dimen/dialpad_symbol_margin_bottom</item>
@@ -43,6 +45,8 @@
<style name="DialpadKeyPoundStyle">
<item name="android:textColor">@color/dialpad_secondary_text_color</item>
<item name="android:textSize">@dimen/dialpad_key_pound_size</item>
+ <item name="android:fontFamily">sans-serif-light</item>
+ <item name="android:alpha">0.8</item>
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_marginBottom">@dimen/dialpad_symbol_margin_bottom</item>
@@ -52,7 +56,7 @@
<style name="DialpadKeyLettersStyle">
<item name="android:textColor">@color/dialpad_secondary_text_color</item>
<item name="android:textSize">@dimen/dialpad_key_letters_size</item>
- <item name="android:fontFamily">sans-serif-medium</item>
+ <item name="android:fontFamily">sans-serif-regular</item>
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:gravity">center_horizontal</item>