summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorAndrew Lee <anwlee@google.com>2015-08-10 17:52:44 -0700
committerAndrew Lee <anwlee@google.com>2015-08-11 14:03:07 -0700
commita4adb2c035690a1c9600a20c2485886d9d5991d0 (patch)
tree15cbed485df037d5e6d47190a165c437e9e1f08b /res
parentf5250369eb99d5f2b435be845b5bb19a531538bb (diff)
Show entire call history in Dialer tab.
+ Rename some logic around identifying the scenario (tab vs activity) for the call log. + Add padding at the bottom of the call log. + Make call log in tab show all history, not just recent history. + Rename promo card logic in CallLogAdapter, since it is VM specific. - Remove extra view holder, and associated logic. Bug: 23017190 Change-Id: I1f36f414647705a779ee14e8b43e88bf711bba56
Diffstat (limited to 'res')
-rw-r--r--res/layout/call_log_fragment.xml4
-rw-r--r--res/layout/show_call_history_list_item.xml30
-rw-r--r--res/values/strings.xml3
3 files changed, 3 insertions, 34 deletions
diff --git a/res/layout/call_log_fragment.xml b/res/layout/call_log_fragment.xml
index f69c5139f..aad7d8e77 100644
--- a/res/layout/call_log_fragment.xml
+++ b/res/layout/call_log_fragment.xml
@@ -24,8 +24,10 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/background_dialer_call_log"
+ android:clipToPadding="false"
android:paddingStart="@dimen/call_log_horizontal_margin"
- android:paddingEnd="@dimen/call_log_horizontal_margin" />
+ android:paddingEnd="@dimen/call_log_horizontal_margin"
+ android:paddingBottom="@dimen/floating_action_button_list_bottom_padding" />
<com.android.dialer.widget.EmptyContentView
android:id="@+id/empty_list_view"
diff --git a/res/layout/show_call_history_list_item.xml b/res/layout/show_call_history_list_item.xml
deleted file mode 100644
index 1264894a9..000000000
--- a/res/layout/show_call_history_list_item.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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/strings.xml b/res/values/strings.xml
index 9dcf72bab..8eeb03c4a 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -535,9 +535,6 @@
<!-- Shortcut item used to make a video call directly from search. [CHAR LIMIT=25] -->
<string name="search_shortcut_make_video_call">Make video call</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>