summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2014-03-12 12:07:40 -0700
committerYorke Lee <yorkelee@google.com>2014-03-14 13:16:47 -0700
commit8165cb1734a70c605580c51215b0441efaf04af7 (patch)
treebd6a5ff3524f912ccb30e424a6d117d52ad5d356
parent80b0c11604ea909b66cd87c0fda55abc7d9ad721 (diff)
Slight UX tweaks to Dialer
* Add drawable and apply to dialpad fragment for shadow effect * Tweak name/number padding in tiles * Tweak default letter avatar placing in tiles * Add shadow for dialpad * Swap out 9patch drawable for recents * Add 9patch to contact tile Bug: 13421236 Bug: 13418523 Bug: 13421916 Bug: 13421236 Bug: 13419201 Bug: 13418712 Change-Id: I6ff8fe41d7e2d02db105bb542f425be13ae5fef7
-rw-r--r--res/drawable-hdpi/dialer_recent_card_bg.9.pngbin199 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_tile_for_recents_and_contact_tile.9.pngbin0 -> 333 bytes
-rw-r--r--res/drawable-mdpi/dialer_recent_card_bg.9.pngbin180 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_tile_for_recents_and_contact_tile.9.pngbin0 -> 205 bytes
-rw-r--r--res/drawable-xhdpi/dialer_recent_card_bg.9.pngbin226 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_tile_for_recents_and_contact_tile.9.pngbin0 -> 427 bytes
-rw-r--r--res/drawable-xxhdpi/dialer_recent_card_bg.9.pngbin244 -> 0 bytes
-rw-r--r--res/drawable-xxhdpi/ic_tile_for_recents_and_contact_tile.9.pngbin0 -> 1307 bytes
-rw-r--r--res/drawable/shadow_fade_up.xml24
-rw-r--r--res/layout/dialpad.xml1
-rw-r--r--res/layout/dialpad_fragment.xml6
-rw-r--r--res/layout/phone_favorite_tile_view.xml13
-rw-r--r--res/values/dimens.xml2
-rw-r--r--src/com/android/dialer/list/PhoneFavoriteMergedAdapter.java2
-rw-r--r--src/com/android/dialer/list/PhoneFavoriteTileView.java8
15 files changed, 43 insertions, 13 deletions
diff --git a/res/drawable-hdpi/dialer_recent_card_bg.9.png b/res/drawable-hdpi/dialer_recent_card_bg.9.png
deleted file mode 100644
index 2bfdbcb9c..000000000
--- a/res/drawable-hdpi/dialer_recent_card_bg.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_tile_for_recents_and_contact_tile.9.png b/res/drawable-hdpi/ic_tile_for_recents_and_contact_tile.9.png
new file mode 100644
index 000000000..b5f50de3c
--- /dev/null
+++ b/res/drawable-hdpi/ic_tile_for_recents_and_contact_tile.9.png
Binary files differ
diff --git a/res/drawable-mdpi/dialer_recent_card_bg.9.png b/res/drawable-mdpi/dialer_recent_card_bg.9.png
deleted file mode 100644
index dff6a0b84..000000000
--- a/res/drawable-mdpi/dialer_recent_card_bg.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_tile_for_recents_and_contact_tile.9.png b/res/drawable-mdpi/ic_tile_for_recents_and_contact_tile.9.png
new file mode 100644
index 000000000..e43b3efd4
--- /dev/null
+++ b/res/drawable-mdpi/ic_tile_for_recents_and_contact_tile.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/dialer_recent_card_bg.9.png b/res/drawable-xhdpi/dialer_recent_card_bg.9.png
deleted file mode 100644
index 05d254d6a..000000000
--- a/res/drawable-xhdpi/dialer_recent_card_bg.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_tile_for_recents_and_contact_tile.9.png b/res/drawable-xhdpi/ic_tile_for_recents_and_contact_tile.9.png
new file mode 100644
index 000000000..ebfe89791
--- /dev/null
+++ b/res/drawable-xhdpi/ic_tile_for_recents_and_contact_tile.9.png
Binary files differ
diff --git a/res/drawable-xxhdpi/dialer_recent_card_bg.9.png b/res/drawable-xxhdpi/dialer_recent_card_bg.9.png
deleted file mode 100644
index 87d95f0ed..000000000
--- a/res/drawable-xxhdpi/dialer_recent_card_bg.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_tile_for_recents_and_contact_tile.9.png b/res/drawable-xxhdpi/ic_tile_for_recents_and_contact_tile.9.png
new file mode 100644
index 000000000..0a99cdb26
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_tile_for_recents_and_contact_tile.9.png
Binary files differ
diff --git a/res/drawable/shadow_fade_up.xml b/res/drawable/shadow_fade_up.xml
new file mode 100644
index 000000000..e2d993484
--- /dev/null
+++ b/res/drawable/shadow_fade_up.xml
@@ -0,0 +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.
+-->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+ android:shape="rectangle" >
+ <gradient
+ android:type="linear"
+ android:startColor="#66999999"
+ android:endColor="#00ffffff"
+ android:angle="90"/>
+</shape> \ No newline at end of file
diff --git a/res/layout/dialpad.xml b/res/layout/dialpad.xml
index c3db42094..c13f525be 100644
--- a/res/layout/dialpad.xml
+++ b/res/layout/dialpad.xml
@@ -22,7 +22,6 @@
android:layout_height="wrap_content"
android:paddingLeft="5dp"
android:paddingRight="5dp"
- android:background="@android:color/transparent"
android:stretchColumns="*"
android:layoutDirection="ltr" >
diff --git a/res/layout/dialpad_fragment.xml b/res/layout/dialpad_fragment.xml
index 239f72774..dfe5c7c84 100644
--- a/res/layout/dialpad_fragment.xml
+++ b/res/layout/dialpad_fragment.xml
@@ -25,7 +25,11 @@
android:layout_height="0dp"
android:layout_weight="1"
android:background="#00000000" />
-
+ <!-- Dialpad shadow -->
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="3dp"
+ android:background="@drawable/shadow_fade_up" />
<view class="com.android.dialer.dialpad.DialpadFragment$HoverIgnoringLinearLayout"
android:id="@+id/top"
android:animateLayoutChanges="true"
diff --git a/res/layout/phone_favorite_tile_view.xml b/res/layout/phone_favorite_tile_view.xml
index 8562b36e0..54f9de787 100644
--- a/res/layout/phone_favorite_tile_view.xml
+++ b/res/layout/phone_favorite_tile_view.xml
@@ -25,7 +25,8 @@
android:id="@+id/contact_favorite_card"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:focusable="true">
+ android:focusable="true"
+ android:background="@drawable/ic_tile_for_recents_and_contact_tile">
<com.android.contacts.common.widget.LayoutSuppressingImageView
android:id="@+id/contact_tile_image"
@@ -42,11 +43,11 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingLeft="8dp"
- android:paddingRight="@dimen/contact_tile_info_button_height_and_width"
- android:paddingStart="8dp"
- android:paddingEnd="@dimen/contact_tile_info_button_height_and_width"
- android:paddingBottom="12dp"
+ android:paddingLeft="@dimen/contact_tile_text_side_padding"
+ android:paddingRight="@dimen/contact_tile_text_side_padding"
+ android:paddingStart="@dimen/contact_tile_text_side_padding"
+ android:paddingEnd="@dimen/contact_tile_text_side_padding"
+ android:paddingBottom="@dimen/contact_tile_text_bottom_padding"
android:layout_alignParentBottom="true"
android:orientation="vertical" >
<TextView
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 6e563c1c5..e3f2188b0 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -73,6 +73,8 @@
<dimen name="contact_tile_divider_padding">3dp</dimen>
<dimen name="contact_tile_info_button_height_and_width">36dp</dimen>
<item name="contact_tile_height_to_width_ratio" type="dimen">67%</item>
+ <dimen name="contact_tile_text_side_padding">10dp</dimen>
+ <dimen name="contact_tile_text_bottom_padding">9dp</dimen>
<dimen name="favorites_row_top_padding">6dp</dimen>
<dimen name="favorites_row_bottom_padding">6dp</dimen>
<dimen name="favorites_row_start_padding">8dp</dimen>
diff --git a/src/com/android/dialer/list/PhoneFavoriteMergedAdapter.java b/src/com/android/dialer/list/PhoneFavoriteMergedAdapter.java
index e09fc7d41..e966f101d 100644
--- a/src/com/android/dialer/list/PhoneFavoriteMergedAdapter.java
+++ b/src/com/android/dialer/list/PhoneFavoriteMergedAdapter.java
@@ -345,7 +345,7 @@ public class PhoneFavoriteMergedAdapter extends BaseAdapter {
@Override
public void addView(View view) {
- view.setBackgroundResource(R.drawable.dialer_recent_card_bg);
+ view.setBackgroundResource(R.drawable.ic_tile_for_recents_and_contact_tile);
final FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(
FrameLayout.LayoutParams.MATCH_PARENT,
diff --git a/src/com/android/dialer/list/PhoneFavoriteTileView.java b/src/com/android/dialer/list/PhoneFavoriteTileView.java
index 16bf6293d..9761fc311 100644
--- a/src/com/android/dialer/list/PhoneFavoriteTileView.java
+++ b/src/com/android/dialer/list/PhoneFavoriteTileView.java
@@ -48,11 +48,11 @@ public abstract class PhoneFavoriteTileView extends ContactTileView {
private static final String TAG = PhoneFavoriteTileView.class.getSimpleName();
private static final boolean DEBUG = false;
- // These parameters instruct the photo manager to display the default image/letter at 70% of
- // its normal size, and vertically offset upwards 20% towards the top of the letter tile, to
+ // These parameters instruct the photo manager to display the default image/letter at 65% of
+ // its normal size, and vertically offset upwards 17% towards the top of the letter tile, to
// make room for the contact name and number label at the bottom of the image.
- private static final float DEFAULT_IMAGE_LETTER_OFFSET = -0.2f;
- private static final float DEFAULT_IMAGE_LETTER_SCALE = 0.70f;
+ private static final float DEFAULT_IMAGE_LETTER_OFFSET = -0.17f;
+ private static final float DEFAULT_IMAGE_LETTER_SCALE = 0.65f;
/** Length of all animations in miniseconds. */
private int mAnimationDuration;