summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorAndrew Lee <anwlee@google.com>2015-05-05 17:30:23 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-05-05 17:30:23 +0000
commit9410a60482dcbcc4fb11b6af8e80faffea4aacda (patch)
treec9123ece71181ec86e65f89e50d50c4dd2395831 /res
parent7ea6420e790c4206f4cfa44ff22604536cebd5f7 (diff)
parent69705be50fc4c84b35df88c879dd9a4b4de655b3 (diff)
Merge "Add "show call history" list item." into mnc-dev
Diffstat (limited to 'res')
-rw-r--r--res/layout/call_log_list_item.xml4
-rw-r--r--res/layout/show_call_history_list_item.xml30
-rw-r--r--res/values/dimens.xml10
-rw-r--r--res/values/strings.xml4
-rw-r--r--res/values/styles.xml2
5 files changed, 41 insertions, 9 deletions
diff --git a/res/layout/call_log_list_item.xml b/res/layout/call_log_list_item.xml
index a0ed5c799..5928183f8 100644
--- a/res/layout/call_log_list_item.xml
+++ b/res/layout/call_log_list_item.xml
@@ -49,8 +49,8 @@
android:layout_height="wrap_content"
android:paddingStart="@dimen/call_log_start_margin"
android:paddingEnd="@dimen/call_log_outer_margin"
- android:paddingTop="@dimen/call_log_outer_margin"
- android:paddingBottom="@dimen/call_log_outer_margin"
+ android:paddingTop="@dimen/call_log_vertical_padding"
+ android:paddingBottom="@dimen/call_log_vertical_padding"
android:orientation="horizontal"
android:gravity="center_vertical"
android:focusable="true"
diff --git a/res/layout/show_call_history_list_item.xml b/res/layout/show_call_history_list_item.xml
new file mode 100644
index 000000000..1264894a9
--- /dev/null
+++ b/res/layout/show_call_history_list_item.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 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.
+-->
+
+<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+ style="@style/CallLogCardStyle"
+ android:layout_height="40dp"
+ android:clickable="true"
+ android:foreground="?android:attr/selectableItemBackground">
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:text="@string/show_call_history" />
+
+</android.support.v7.widget.CardView>
+
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 502b21a59..b9b3aa587 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -22,15 +22,17 @@
<dimen name="remove_text_size">16dp</dimen>
<!-- Call Log -->
- <dimen name="call_log_call_action_size">32dip</dimen>
+ <dimen name="call_log_call_action_size">32dp</dimen>
<dimen name="call_log_call_action_width">54dp</dimen>
- <dimen name="call_log_icon_margin">4dip</dimen>
- <dimen name="call_log_inner_margin">13dip</dimen>
+ <dimen name="call_log_icon_margin">4dp</dimen>
+ <dimen name="call_log_inner_margin">13dp</dimen>
<dimen name="call_log_outer_margin">8dp</dimen>
<dimen name="call_log_start_margin">16dp</dimen>
- <dimen name="call_log_indent_margin">24dip</dimen>
+ <dimen name="call_log_indent_margin">24dp</dimen>
<dimen name="call_log_name_margin_bottom">2dp</dimen>
+ <dimen name="call_log_vertical_padding">12dp</dimen>
<dimen name="call_log_list_item_height">56dip</dimen>
+ <dimen name="show_call_history_list_item_height">72dp</dimen>
<!-- Size of contact photos in the call log and call details. -->
<dimen name="contact_photo_size">40dp</dimen>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4ee5b45c8..7568604af 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -512,8 +512,8 @@
<!-- Shortcut item used to make a video call directly from search. -->
<string name="search_shortcut_make_video_call">Make video call</string>
- <!-- Title for the recent calls footer that brings users to the full call history when clicked -->
- <string name="recents_footer_text">View full call history</string>
+ <!-- Title for the call log list item that brings users to the full call history when clicked -->
+ <string name="show_call_history">View full call history</string>
<!-- Number of missed calls shown on call card [CHAR LIMIT=40] -->
<string name="num_missed_calls"><xliff:g id="number">%s</xliff:g> new missed calls</string>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index dacf6a47c..2cd4aa3e6 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -198,7 +198,7 @@
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_margin">4dp</item>
<item name="android:baselineAligned">false</item>
- <item name="cardCornerRadius">4dp</item>
+ <item name="cardCornerRadius">2dp</item>
<item name="cardBackgroundColor">@color/background_dialer_call_log_list_item</item>
</style>
</resources>