diff options
| author | Andrew Lee <anwlee@google.com> | 2015-10-02 22:50:08 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-10-02 22:50:08 +0000 |
| commit | 64dffce08a6e63755a0863f9c7975421af572c24 (patch) | |
| tree | 3f1326ce2e6c17235b9bc61371f867862325f547 /res/layout | |
| parent | 27bf26e70548c530946e37d994c89c23b7887386 (diff) | |
| parent | 11a7350843ec13c7ca4d27523e9ba146911d2767 (diff) | |
Merge "Prepatory CallDetailActivity tweaks." into ub-contactsdialer-a-dev
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/call_detail.xml | 3 | ||||
| -rw-r--r-- | res/layout/call_detail_history_header.xml | 30 |
2 files changed, 2 insertions, 31 deletions
diff --git a/res/layout/call_detail.xml b/res/layout/call_detail.xml index fde1de5c1..591ba5c45 100644 --- a/res/layout/call_detail.xml +++ b/res/layout/call_detail.xml @@ -60,7 +60,8 @@ android:textColor="?attr/call_log_primary_text_color" android:textSize="@dimen/call_log_primary_text_size" android:includeFontPadding="false" - android:layout_marginBottom="5dp" + android:layout_marginTop="2dp" + android:layout_marginBottom="3dp" android:singleLine="true" /> <TextView diff --git a/res/layout/call_detail_history_header.xml b/res/layout/call_detail_history_header.xml deleted file mode 100644 index def1fd805..000000000 --- a/res/layout/call_detail_history_header.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2009 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. ---> - -<TextView - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:ex="http://schemas.android.com/apk/res-auto" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingTop="@dimen/call_detail_header_top_margin" - android:paddingBottom="@dimen/call_detail_header_bottom_margin" - android:paddingStart="@dimen/call_detail_horizontal_margin" - android:textColor="?attr/call_log_secondary_text_color" - android:textSize="@dimen/call_log_secondary_text_size" - android:fontFamily="sans-serif-medium" - android:singleLine="true" - android:text="@string/call_detail_list_header" - /> |