diff options
| author | Andrew Lee <anwlee@google.com> | 2015-10-02 23:50:30 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-10-02 23:50:30 +0000 |
| commit | ea0742761c5511a713b43af16d4abd1a9059dcd8 (patch) | |
| tree | 7f398fbdf18e2669964da286dc7faa5c566a9ec9 /res/layout | |
| parent | 6a9fe7f962bafdd3aa68cbf01cb3372fca0514a8 (diff) | |
| parent | 73bc910eee877d8f3f7f547e4fce809465f02805 (diff) | |
Merge "Revert "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, 31 insertions, 2 deletions
diff --git a/res/layout/call_detail.xml b/res/layout/call_detail.xml index 591ba5c45..fde1de5c1 100644 --- a/res/layout/call_detail.xml +++ b/res/layout/call_detail.xml @@ -60,8 +60,7 @@ android:textColor="?attr/call_log_primary_text_color" android:textSize="@dimen/call_log_primary_text_size" android:includeFontPadding="false" - android:layout_marginTop="2dp" - android:layout_marginBottom="3dp" + android:layout_marginBottom="5dp" android:singleLine="true" /> <TextView diff --git a/res/layout/call_detail_history_header.xml b/res/layout/call_detail_history_header.xml new file mode 100644 index 000000000..def1fd805 --- /dev/null +++ b/res/layout/call_detail_history_header.xml @@ -0,0 +1,30 @@ +<?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" + /> |