summaryrefslogtreecommitdiffstats
path: root/res/layout/call_detail_history_item.xml
diff options
context:
space:
mode:
authorCheng Xiaolong <chengxiaolong@codeaurora.org>2014-01-07 02:01:17 -0500
committeremancebo <emancebo@cyngn.com>2014-09-03 16:58:11 -0700
commit703573080e9ddc4360da7b81abdb0035d0eb97ce (patch)
tree8bac48a2338679ad4da549f193f619aaa41f9ab4 /res/layout/call_detail_history_item.xml
parent24c2b390c540de5d46c78309528a30c0e209f7de (diff)
downloadandroid_packages_apps_Dialer-703573080e9ddc4360da7b81abdb0035d0eb97ce.tar.gz
android_packages_apps_Dialer-703573080e9ddc4360da7b81abdb0035d0eb97ce.tar.bz2
android_packages_apps_Dialer-703573080e9ddc4360da7b81abdb0035d0eb97ce.zip
Dialer: Add the subscription info for call log.
Add the subscription info on the call log and call detail activity. - add spinner to select "ALL SIMS","SIM1","SIM2" to filter call log - add spinner to select "ALL CALLS","INCOMING CALLS ONLY", "OUTGOING CALLS ONLY","MISSED CALLS ONLY" Conflicts: res/layout/call_log_list_item.xml res/values-zh-rCN/strings.xml res/values/strings.xml src/com/android/dialer/CallDetailActivity.java src/com/android/dialer/DialtactsActivity.java src/com/android/dialer/PhoneCallDetails.java src/com/android/dialer/PhoneCallDetailsHelper.java src/com/android/dialer/calllog/CallDetailHistoryAdapter.java src/com/android/dialer/calllog/CallLogActivity.java src/com/android/dialer/calllog/CallLogAdapter.java src/com/android/dialer/calllog/CallLogListItemViews.java tests/src/com/android/dialer/PhoneCallDetailsHelperTest.java tests/src/com/android/dialer/calllog/CallLogListItemHelperTest.java Change-Id: Ib4ad371af61e9473dfe1b10e83abd2b1acaa7ef7
Diffstat (limited to 'res/layout/call_detail_history_item.xml')
-rw-r--r--res/layout/call_detail_history_item.xml29
1 files changed, 24 insertions, 5 deletions
diff --git a/res/layout/call_detail_history_item.xml b/res/layout/call_detail_history_item.xml
index a5acf5258..473e1410c 100644
--- a/res/layout/call_detail_history_item.xml
+++ b/res/layout/call_detail_history_item.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2011 The Android Open Source Project
+ Copyright (C) 2013, The Linux Foundation. All rights reserved.
+
+ Not a Contribution.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -47,13 +50,29 @@
android:textColor="?attr/call_log_secondary_text_color"
/>
</LinearLayout>
- <TextView
- android:id="@+id/date"
+
+ <LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:textColor="?attr/call_log_secondary_text_color"
- />
+ android:orientation="horizontal"
+ >
+ <ImageView
+ android:id="@+id/sub_icon"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginRight="@dimen/call_log_icon_margin"
+ android:layout_marginBottom="@dimen/call_detail_button_spacing"
+ android:layout_gravity="bottom"
+ />
+ <TextView
+ android:id="@+id/date"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:textColor="?attr/call_log_secondary_text_color"
+ />
+ </LinearLayout>
+
<TextView
android:id="@+id/duration"
android:layout_width="wrap_content"